Merge latest version of KBarCode with the TDE sources

This relates to Bug 2095
Note that a handful of translation strings did not merge properly

42 files changed, 4752 insertions, 6286 deletions

diff --git a/ChangeLog b/ChangeLog
index 811e96f..b8f0f32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 Changelog since Version 1.3.2:
 ==============================
 
+Version 2.0.7
+    Fixed building on systems with Automake 1.10 or later
+    Fixed text rendering on systems with TQt 3.3.8b
+    Dropped support for TQt 3.3.2 and earlier
+    Cleaned up Help menu
+
 Version 2.0.6
     Dag Nygren contributed a patch which fixes printing from a CSV file
     Check if files passed for batchprinting from the commandline do exist
diff --git a/configure.in b/configure.in
index 966fbd1..6c09929 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kbarcode, 2.0.6) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kbarcode, 2.0.7) dnl searches for some needed programs
 
 KDE_SET_PREFIX
 
diff --git a/configure.in.in b/configure.in.in
index 5e57646..3448a6e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,7 +1,7 @@
 #MIN_CONFIG(3.0.0)
 KDE_ENABLE_HIDDEN_VISIBILITY
 
-AM_INIT_AUTOMAKE(kbarcode, 2.0.6)
+AM_INIT_AUTOMAKE(kbarcode, 2.0.7)
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am
index 4abb9cc..0905c5b 100644
--- a/fileplugin/Makefile.am
+++ b/fileplugin/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdefile_kbarcode.la
 
 tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp
 tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
-tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE)
+tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE) $(LIB_QT)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/kbarcode.spec b/kbarcode.spec
index 568048b..bd6ef88 100644
--- a/kbarcode.spec
+++ b/kbarcode.spec
@@ -1,5 +1,5 @@
 %define name kbarcode
-%define version 2.0.6
+%define version 2.0.7
 Summary: A barcode and label printing application for KDE
 Name: %{name}
 Version: %{version}
@@ -30,7 +30,7 @@ fi
 make -j$numprocs
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install-strip DESTDIR=$RPM_BUILD_ROOT
 
 cd $RPM_BUILD_ROOT
 find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kbarcode
diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am
index a6a22bc..999f370 100644
--- a/kbarcode/Makefile.am
+++ b/kbarcode/Makefile.am
@@ -13,7 +13,7 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kdedcoptest.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kbarcode.pot
 
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
@@ -25,34 +25,32 @@ kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
 kbarcode_LDADD = $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEPRINT) \
 	$(LIB_TDEUI) -lkjs -lpcre
 
-noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \
-	commands.h configdialog.h confwizard.h csvimportdlg.h databasebrowser.h \
-	definition.h definitiondialog.h dsmainwindow.h dsrichtext.h kbarcode.h label.h \
-	labeleditor.h labelutils.h mimesources.h multilineeditdlg.h \
-	mycanvasitem.h mycanvasview.h mydatatable.h newlabel.h previewdialog.h \
-	printersettings.h printlabeldlg.h rectsettingsdlg.h smalldialogs.h sqltables.h \
-	tokenprovider.h xmlutils.h zplutils.h measurements.h editoriface.h kbarcodeiface.h \
-	batchiface.h kbarcodesettings.h batchprinter.h barcodeitem.h documentitem.h \
-	lineitem.h rectitem.h tcanvasitem.h textitem.h imageitem.h documentitemdlg.h \
-	propertywidget.h tec.h barcodeprinterdlg.h textlineitem.h textlineedit.h tokendialog.h \
-	barkode.h gnubarcode.h barkodeengine.h pixmapbarcode.h batchwizard.h csvfile.h \
-	referencecounted.h dstextedit.h encodingcombo.h purepostscript.h tbarcode2.h \
-	tdeactionmap.h
-
-kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
-	barcodedialogs.cpp commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp \
-	databasebrowser.cpp definition.cpp definitiondialog.cpp dsmainwindow.cpp dsrichtext.cpp \
-	kbarcode.cpp label.cpp labeleditor.cpp labelutils.cpp main.cpp \
-	mimesources.cpp multilineeditdlg.cpp mycanvasitem.cpp mycanvasview.cpp mydatatable.cpp \
-	newlabel.cpp previewdialog.cpp printersettings.cpp printlabeldlg.cpp \
-	rectsettingsdlg.cpp smalldialogs.cpp sqltables.cpp tokenprovider.cpp xmlutils.cpp \
-	zplutils.cpp measurements.cpp editoriface.skel kbarcodeiface.skel batchiface.skel \
-	kbarcodesettings.cpp batchprinter.cpp barcodeitem.cpp documentitem.cpp lineitem.cpp \
-	rectitem.cpp tcanvasitem.cpp textitem.cpp imageitem.cpp documentitemdlg.cpp \
-	propertywidget.cpp tec.cpp barcodeprinterdlg.cpp textlineitem.cpp textlineedit.cpp \
-	tokendialog.cpp barkode.cpp gnubarcode.cpp barkodeengine.cpp pixmapbarcode.cpp batchwizard.cpp \
-	csvfile.cpp referencecounted.cpp dstextedit.cpp encodingcombo.cpp purepostscript.cpp tbarcode2.cpp \
-	tdeactionmap.cpp
+noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h commands.h \
+	configdialog.h confwizard.h csvimportdlg.h databasebrowser.h definition.h \
+	definitiondialog.h dsmainwindow.h kbarcode.h label.h labeleditor.h labelutils.h \
+	mimesources.h multilineeditdlg.h mycanvasitem.h mycanvasview.h mydatatable.h \
+	newlabel.h previewdialog.h printersettings.h printlabeldlg.h rectsettingsdlg.h \
+	smalldialogs.h sqltables.h tokenprovider.h xmlutils.h zplutils.h measurements.h \
+	editoriface.h kbarcodeiface.h batchiface.h kbarcodesettings.h batchprinter.h \
+	barcodeitem.h documentitem.h lineitem.h rectitem.h tcanvasitem.h textitem.h \
+	imageitem.h documentitemdlg.h propertywidget.h tec.h barcodeprinterdlg.h \
+	textlineitem.h textlineedit.h tokendialog.h barkode.h gnubarcode.h barkodeengine.h \
+	pixmapbarcode.h batchwizard.h csvfile.h referencecounted.h dstextedit.h encodingcombo.h \
+	purepostscript.h tbarcode2.h
+
+kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp barcodedialogs.cpp \
+	commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp databasebrowser.cpp \
+	definition.cpp definitiondialog.cpp dsmainwindow.cpp kbarcode.cpp label.cpp \
+	labeleditor.cpp labelutils.cpp main.cpp mimesources.cpp multilineeditdlg.cpp \
+	mycanvasitem.cpp mycanvasview.cpp mydatatable.cpp newlabel.cpp previewdialog.cpp \
+	printersettings.cpp printlabeldlg.cpp rectsettingsdlg.cpp smalldialogs.cpp sqltables.cpp \
+	tokenprovider.cpp xmlutils.cpp zplutils.cpp measurements.cpp editoriface.skel \
+	kbarcodeiface.skel batchiface.skel kbarcodesettings.cpp batchprinter.cpp barcodeitem.cpp \
+	documentitem.cpp lineitem.cpp rectitem.cpp tcanvasitem.cpp textitem.cpp imageitem.cpp \
+	documentitemdlg.cpp propertywidget.cpp tec.cpp barcodeprinterdlg.cpp textlineitem.cpp \
+	textlineedit.cpp tokendialog.cpp barkode.cpp gnubarcode.cpp barkodeengine.cpp \
+	pixmapbarcode.cpp batchwizard.cpp csvfile.cpp dstextedit.cpp encodingcombo.cpp \
+	purepostscript.cpp tbarcode2.cpp
 
 xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-single.desktop
 
diff --git a/kbarcode/barcodecombo.h b/kbarcode/barcodecombo.h
index 4b0c645..cfc260e 100644
--- a/kbarcode/barcodecombo.h
+++ b/kbarcode/barcodecombo.h
@@ -25,7 +25,7 @@
 #include "barkode.h"
 
 /** A validator that takes to TQRegExp's to check
- *  wether a barcode is valid or not.
+ *  whether a barcode is valid or not.
  */
 class BarcodeValidator : public TQValidator {
  public:
diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp
index 9ac754b..22411c5 100644
--- a/kbarcode/barcodedialogs.cpp
+++ b/kbarcode/barcodedialogs.cpp
@@ -224,11 +224,7 @@ void TBarcodeDlg::setData( Barkode* b )
         TQMap<TQString,int>::Iterator it;
         for ( it = map.begin(); it != map.end(); ++it ) {
             if( it.data() == options->checksum() ) {
-                for( int i = 0; i < comboCheckSum->count(); i++ )
-                    if( comboCheckSum->text( i ) == it.key() ) {
-                        comboCheckSum->setCurrentItem( i );
-                        break;
-                    }
+                comboCheckSum->setCurrentItem(it.key());
                 break;
             }
         }
diff --git a/kbarcode/barkode.h b/kbarcode/barkode.h
index 57d21d5..9c4bfd9 100644
--- a/kbarcode/barkode.h
+++ b/kbarcode/barkode.h
@@ -202,7 +202,7 @@ class Barkode {
       */    
     void drawInvalid( TQPainter & painter, int x = 0, int y = 0 );
     
-    /** returns wether barcode functionallity
+    /** returns whether barcode functionallity
       * is available
       */
     static bool haveBarcode() {
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 3808de5..51585f6 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -20,7 +20,6 @@
 #include "confwizard.h"
 #include "printersettings.h"
 #include "kbarcodesettings.h"
-#include "tdeactionmap.h"
 #include "barkode.h"
 
 // TQt includes
@@ -71,6 +70,7 @@ void DSMainWindow::setupActions()
     TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQT_SLOT(configure()), actionCollection() );
     TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, TQT_TQOBJECT(this), 
                                 TQT_SLOT(wizard()), actionCollection(), "wizard" );
+
     connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, TQT_TQOBJECT(this),  TQT_SLOT(connectMySQL()),
                                 actionCollection(),"connect" );
 
@@ -91,13 +91,11 @@ void DSMainWindow::setupActions()
     hlpMenu->removeItem( helpid );
     hlpMenu->insertItem( SmallIconSet("contents"), i18n("&Help"),
         this, TQT_SLOT(appHelpActivated()), Key_F1, -1, 0 );
-    hlpMenu->insertSeparator(-1);
-    hlpMenu->insertItem( i18n("&Action Map..."), TQT_TQOBJECT(this),  TQT_SLOT( slotFunctionMap() ), 0, -1, 0 );
-    hlpMenu->insertSeparator(-2);
-    hlpMenu->insertItem( SmallIconSet("system"), i18n("&System Check..."), TQT_TQOBJECT(this),  TQT_SLOT(showCheck() ), 0, -1, 0 );
-    hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), TQT_TQOBJECT(this),  TQT_SLOT( startInfo() ), 0, -1, 0 );
-    hlpMenu->insertItem( i18n("&Donate..."), TQT_TQOBJECT(this),  TQT_SLOT( donations() ), 0, -1, 0 );
-
+    hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), this, TQT_SLOT( startInfo() ), 0, -1, 1 );
+    hlpMenu->insertSeparator(3);
+    hlpMenu->insertItem( i18n("&Donate..."), this, TQT_SLOT( donations() ), 0, -1, 4 );
+    hlpMenu->insertSeparator(5);
+    hlpMenu->insertItem( SmallIconSet("system"), i18n("&System Check..."), this, TQT_SLOT(showCheck() ), 0, -1, 6 );
     menuBar()->insertItem( i18n("&File"), file );
     menuBar()->insertItem( i18n("&Settings"), settings );
     menuBar()->insertItem( i18n("&Help"), hlpMenu );
@@ -207,13 +205,11 @@ bool DSMainWindow::newTables()
 
 void DSMainWindow::donations()
 {
-    // orig =https://www.paypal.com/xclick/business=domseichter%40web.de&item_name=Support+KBarcode+Development&item_number=0&image_url=http%3A//www.kbarcode.net/themes/DeepBlue/images/logo.gif&no_shipping=1&return=http%3A//www.kbarcode.net&cancel_return=http%3A//www.kbarcode.net&cn=Suggestions%2C+Comments%3F&tax=0&currency_code=EUR
-    TQString url = "https://www.paypal.com/xclick/[email protected]&item_name=Support+KBarcode+Development&item_number=0&image_url=www.kbarcode.net/themes/DeepBlue/images/logo.gif&no_shipping=1&return=www.kbarcode.net&cancel_return=www.kbarcode.net&cn=Suggestions,+Comments,&tax=0&currency_code=EUR";
-    
+    TQString url = "https://trinitydesktop.org/donate.php";
+
     KMessageBox::information( this, i18n(
-        "<qt>It is possible to support the further development of KBarcode through donations. "
-        "PayPal will be used for processing the donation.<br><br>" ) +
-        "<a href=\"" + url + "\">" +  
+        "<qt>It is possible to support the further development of KBarcode through donations.<br><br>" ) +
+        "<a href=\"" + url + "\">" +
         i18n("Donate Now") + "</a></qt>", TQString(), TQString(), KMessageBox::AllowLink );
 }
 
@@ -260,9 +256,4 @@ TQString DSMainWindow::systemCheck()
     return text;
 }
 
-void DSMainWindow::slotFunctionMap()
-{
-    new TDEActionMapDlg( actionCollection(), this );
-}
-
 #include "dsmainwindow.moc"
diff --git a/kbarcode/dsmainwindow.h b/kbarcode/dsmainwindow.h
index 9c3da0b..94e342b 100644
--- a/kbarcode/dsmainwindow.h
+++ b/kbarcode/dsmainwindow.h
@@ -27,7 +27,7 @@ class TDEPopupMenu;
   * for database connections, preferences, help, the first start wizard and donations.
   * It checks also if this is the first start of KBarcode and if the configuration wizard
   * should be started.
-  *
+ *MessageBox
   * @author Dominik Seichter
   */
 class DSMainWindow : public TDEMainWindow {
@@ -66,7 +66,6 @@ class DSMainWindow : public TDEMainWindow {
         bool newTables();
         void donations();
         void showCheck();
-        void slotFunctionMap();
 
     protected slots:
         void loadConfig();
@@ -77,6 +76,7 @@ class DSMainWindow : public TDEMainWindow {
 
         static bool autoconnect;
         static bool startwizard;
+        void slotFunctionMap();
 
         bool first;
         
diff --git a/kbarcode/dsrichtext.cpp b/kbarcode/dsrichtext.cpp
deleted file mode 100644
index 2224f2f..0000000
--- a/kbarcode/dsrichtext.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/***************************************************************************
-                          dsrichtext.cpp  -  description
-                             -------------------
-    begin                : Fre Okt 17 2003
-    copyright            : (C) 2003 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "dsrichtext.h"
-
-#ifdef TQT_TEXT_BUG
-
-// TQt includes
-#include <tqfontmetrics.h>
-#include <tqpainter.h>
-#include <tqregexp.h>
-
-// for DSREPLACE
-#include "sqltables.h"
-
-/*
-EXAMPLE TEXT:
-    "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\"font-size:10pt;font-family:Nimbus Sans l\">"
-    "<p>A little bit <span style=\"font-style:italic;font-weight:600\">formated</span><span style=\"color:#4400ff\"> "
-    "richtext</span> which should be printed to a <span style=\"font-weight:600\">TQPrinter</span> with <span style=\"text-decoration:underline\">TQSimpleRichText</span>. </p>"
-    "<p><span style=\"font-family:Times New Roman;font-size:16pt\">Printing should work in ScreenResolution as well as in HighResolution, but as you can see it will only work in ScreenResolution.</span></p>"
-    "</body></html>";
-
-Another example
-<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Nimbus Sans l">
-<p align="center"><span style="font-size:12pt;font-weight:600;text-decoration:underline">Text test </span><span style="font-size:12pt;font-weight:600;text-decoration:underline;color:#ff0000">label</span></p>
-<p>Resolution <span style="font-weight:600">formated</span> 108dpi. This text &amp; text should now overlap with the first line. 4  &lt; 6a</p>
-<p><span style="font-family:Nimbus Sans L;font-weight:600">A</span><span style="font-family:Nimbus Sans L"> longer paragraph with some text, so that I can test wether wordwrap is working. Another &quot;line&quot; to test line spacing without a bigger font (like the one found in the next sentence) messing up the spacing.</span><span style="font-family:Courier [Adobe];font-size:16pt"> Some text &quot;in&quot; a bigger courier font.</span><span style="font-family:Nimbus Sans L"> Also this paragraph should be justified as blockquote.</span><span style="font-family:Nimbus Sans L;color:#ff0004"> I hope it works</span><span style="font-family:Nimbus Sans L"> and KBarcodes text redering will be better than the one found in TQt.</span></p>
-</body></html>
-
-*/
-
-DSRichText::DSRichText( const TQString & t )
-    : text( t )
-{
-    if( text.find("<html>") == -1 )
-        text = "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\"font-size:10pt;font-family:Nimbus Sans l\"><p>"
-               + t + "</p></body></html>";
-
-    //tqDebug( text );
-
-    start = end = pos = 0;
-    x = y = 0;
-    sx = sy = 1.0;
-    m_base = TQFont();
-
-    TQString tmp = parse( text, "<body ", ">", 0 );
-    if( !tmp.isNull() ) {
-        pos += tmp.length();
-        tmp = tmp.left( tmp.length() - 1 );
-        tmp = tmp.mid( 5, tmp.length() - 5 );
-        m_base = parseStyle( parse( tmp, "style=\"", "\"", pos ), &m_color );
-    }
-
-    pos = text.find( "<p", 0 ); // initalize pos correctly
-    while( parseParagraph() ); // empty while loop
-}
-
-DSRichText::~DSRichText()
-{
-}
-
-void DSRichText::initFormat( formated_word* f, int alignment )
-{
-    f->text = TQString();
-    f->line = false;
-    f->alignment = alignment;
-    f->font = m_base;
-    f->color = m_color;
-}
-
-void DSRichText::initLine( TQValueList<formated_line>* l )
-{
-    formated_line li;
-    li.width = 0;
-    li.ascent = 0;
-    li.leading = 0;
-    li.lineSpacing = 0;
-    li.line = false;
-    l->append( li );
-}
-
-void DSRichText::updateSpacing( TQValueList<formated_line>* l, TQFontMetrics* fm )
-{
-    l->last().lineSpacing = (l->last().lineSpacing < fm->lineSpacing()) ? fm->lineSpacing() : l->last().lineSpacing;
-    l->last().ascent = (l->last().ascent < fm->ascent()) ? fm->ascent() : l->last().ascent;
-    l->last().leading = (l->last().leading < fm->leading()) ? fm->leading() : l->last().leading;
-}
-
-void DSRichText::fillLines()
-{
-    for( unsigned int z = 0; z < word_p.count(); z++ ) {
-        WordList words = word_p[z];
-        LineList lines;
-        initLine( &lines );
-        for( unsigned int i = 0; i < words.count(); i++ ) {
-            formated_word word = words[i];
-            lines.last().line = lines.last().line | word.line;
-
-            TQFontMetrics fm( word.font );
-            updateSpacing( &lines, &fm );
-
-            int tw = fm.width( word.text );
-            // word does not fit in the current line, create a new one
-            if( lines.last().width + tw >= w ) 
-                initLine( &lines );
-
-            // TODO: check here for words longer than one line
-            lines.last().formats.append( word );
-            lines.last().width += tw;
-        }
-        line_p.append( lines );
-    }
-}
-
-void DSRichText::draw( TQPainter* p )
-{
-    /* don't try to draw if there is no space to draw */
-    if( !w || !h )
-        return;
-        
-    fillLines();
-
-    painter = p;
-    painter->save();
-    painter->setClipRect( xpos, ypos, int(w*sx), int(h*sy), TQPainter::CoordPainter );
-
-    for( unsigned int z = 0; z < line_p.count(); z++ ) {
-        LineList lines = line_p[z];
-        if( lines.count() && z )
-            y += int( lines[0].lineSpacing * 0.5);
-
-        for( unsigned int i = 0; i < lines.count(); i++ ) {
-            formated_line l = lines[i];
-            
-            if( l.formats.count() && l.formats[0].alignment == TQt::AlignJustify && i != lines.count() - 1 ) {
-                // last line in a paragraph is not justified (in blocksatz mode)!
-                drawJustified( &l );
-            } else {
-                for( unsigned int z = 0; z < l.formats.count(); z++ ) {
-                    formated_word f = l.formats[z];
-            
-                    painter->setFont( f.font );
-                    painter->setPen( TQPen( f.color ) );
-
-                    int a = f.alignment;
-                    if( a == TQt::AlignRight ) {
-                        a = TQt::AlignLeft;
-                        if( !x )
-                            x = w - l.width;
-                    } else if( a == TQt::AlignHCenter ) {
-                        a = TQt::AlignLeft;
-                        if( !x )
-                            x = ( w - l.width ) / 2;
-                    } 
-
-                    int ya = yDeviation( &l );
-                    painter->drawText( xpos + int(x*sx), ypos + int((y+ya)*sy), int(l.width*sx), int(l.lineSpacing * sy), a, f.text );
-                    x +=  painter->fontMetrics().width( f.text );
-                }
-            }
-
-            x = 0;
-            y += l.lineSpacing;
-        }
-    }
-
-    painter->restore();
-}
-
-void DSRichText::drawJustified( formated_line* line )
-{
-    int all = 0;
-    for( unsigned int z = 0; z < line->formats.count(); z++ ) {
-        line->formats[z].text = line->formats[z].text.stripWhiteSpace();
-        TQFontMetrics fm( line->formats[z].font );
-        all += fm.width( line->formats[z].text );
-    }
-
-    int x = 0;
-    int space = (w - all) / (line->formats.count() - 1);
-    for( unsigned int z = 0; z < line->formats.count(); z++ ) {
-        painter->setFont( line->formats[z].font );
-        painter->setPen( TQPen( line->formats[z].color ) );
-
-        int ya = yDeviation( line );
-        int tw = painter->fontMetrics().width(line->formats[z].text);
-        painter->drawText( int(x*sx), int((y+ya)*sy), int(tw*sx), int(line->lineSpacing * sy), TQt::AlignAuto, line->formats[z].text );
-        x += tw;
-        x += space;
-    }
-
-}
-
-bool DSRichText::parseParagraph()
-{
-    int alignment = 0;
-    formated_word f;
-    TQString d = parse( text, "<p", "</p>", pos );
-    //tqDebug("D=" + d );
-    //tqDebug("POS=%i", pos );
-
-    pos += d.length();
-    if( d.isNull() )
-        return false;
-
-    d = parseParagraphTag( d, &alignment );
-
-    WordList words;
-    TQString data;
-    initFormat( &f, alignment );
-
-    if( d.isEmpty() ) {
-        // found empty paragraph
-        words.append( f );
-        word_p.append( words );
-        return true;
-    }
-
-    for( unsigned int i = 0; i < d.length(); ) {
-        if( d[i] == '<' || i == (d.length() - 1) ) {
-            if( i == (d.length() - 1) )
-                data.append( d[i] );
-
-            parseWords( data, &f, &words );
-            initFormat( &f, alignment );
-            data = TQString();
-
-            // bail out now, otherwise there is
-            // and endless loop for e.g. <p>a</p>
-            if( i == (d.length() - 1) )
-                break;
-
-            if( d[i] == '<' ) {
-                TQString span = d.mid( i, d.find( ">", i ) - i + 1 );
-                i += span.length();
-
-                if( span.startsWith( "<span " ) ) {
-                    initFormat( &f, alignment );
-                    f.font = parseStyle( parse( span, "style=\"", "\"", 0 ), &f.color );
-                }
-            }
-        } else {
-            data.append( d[i] );
-            i++;
-        }
-    }
-
-    word_p.append( words );
-    return true;
-}
-
-TQFont DSRichText::parseStyle( const TQString & s, TQColor* color )
-{
-    TQString style = TQString( s );
-
-    style = style.left( style.length() - 1 );
-    if( style.startsWith("style=\"" ) )
-        style = style.mid( 7, style.length() - 7 );
-
-    TQFont f = m_base;
-    *color = m_color;
-    
-    for ( int i = 0; i < style.contains(';')+1; i++ ) {
-        TQString s = style.section( ';', i, i );
-        if( s.isEmpty() )
-            continue;
-                    
-        if ( s.startsWith("font-size:" ) ) {
-            f.setPointSize( s.mid(10, s.length() - 12).toInt() );
-        } else if ( s.startsWith("font-family:" )  ) {
-            f.setFamily( s.right( s.length() - 12 ) );
-        } else if( s.startsWith( "color:" ) ) {
-            color->setNamedColor( s.right( s.length() - 6 ) );
-        } else if( s.startsWith("text-decoration:") ) {
-            if( s.endsWith( "underline" ) )
-                f.setUnderline( true );
-/*#if [[[TQT_VERSION IS DEPRECATED]]] >= 0x030200
-       else if( s.endsWith( "overline" ) )
-                f.setOverline( true );
-#endif */
-            else if( s.endsWith( "line-through" ) )
-                f.setStrikeOut( true );
-        } else if( s.startsWith( "font-style:") ) {
-            if( s.endsWith( "italic" ) || s.endsWith( "oblique" ) )
-                f.setItalic( true );
-        } else if( s.startsWith( "font-weight:" ) ) {
-            bool ok = false;
-            int n = s.right( s.length() - 12 ).toInt( &ok );
-            if( s.endsWith( "bold" ) )
-                f.setBold( true );
-            else if( ok )
-                f.setWeight( n / 8 ); // convert CSS values to TQt values
-        }
-    }
-
-    return f;
-}
-
-TQString DSRichText::parse( const TQString & t, const TQString & find, const TQString & find2, int start )
-{
-    int s = t.find( find, start );
-    if( s == -1 || s < start )
-        return TQString();
-
-    int pend = t.find( find2, s + find.length() );
-    if( pend == -1 || pend < (signed int)(s + find.length()) )
-        return TQString();
-
-    TQString text = t.mid( s, pend - s + find2.length() );
-    return text;
-}
-
-void DSRichText::setX( int x )
-{
-    xpos = x;
-}
-
-void DSRichText::setY( int y )
-{
-    ypos = y;
-}
-
-void DSRichText::setWidth( int width )
-{
-    w = width;
-}
-
-void DSRichText::setHeight( int height )
-{
-    h = height;
-}
-
-int DSRichText::parseAlignment( const TQString & align )
-{
-    TQString a = TQString( align );
-    if( a.endsWith("\"") )
-        a = a.left( a.length() - 1 ); 
-
-    if( a.startsWith("align=\"") )
-        a = a.mid( 7, a.length() - 7 );
-
-    if( a == "left" )
-        return TQt::AlignLeft;
-    else if( a == "center" )
-        return TQt::AlignHCenter;
-    else if( a == "right" )
-        return TQt::AlignRight;
-    else if( a == "justify" )
-        return TQt::AlignJustify;
-
-    return 0;
-}
-
-void DSRichText::parseWords( const TQString & t, formated_word* w, WordList* words )
-{
-    unsigned int p = 0;
-    for( unsigned int i = 0; i < t.length(); i++ ) {
-        if( (t[i].isSpace() && p != i) || i == t.length() - 1 ) {
-            formated_word word = *w;
-
-            word.text = replaceEscapeSequences( t.mid( p, i + 1 - p ) );
-
-            p = i + 1;
-            words->append( word );
-        }
-    }
-}
-
-inline int DSRichText::yDeviation( const formated_line* line )
-{
-    // leading = 1 (almost ever)
-    // linespacing = leading + height
-    // height = ascent + descent + 1
-    if( line->lineSpacing != painter->fontMetrics().lineSpacing() ) {
-        return line->ascent + line->leading - painter->fontMetrics().ascent() - painter->fontMetrics().leading();
-    } else {
-        return 0;
-    }
-}
-
-TQString DSRichText::replaceEscapeSequences( const TQString & t )
-{
-    TQString tmp = TQString( t );
-    tmp = tmp.replace( DSREPLACE( "&lt;" ), "<" );
-    tmp = tmp.replace( DSREPLACE( "&gt;" ), ">" );
-    tmp = tmp.replace( DSREPLACE( "&amp;" ), "&" );
-    tmp = tmp.replace( DSREPLACE( "&quot;" ), "\"" );
-    return tmp;
-}
-
-TQString DSRichText::parseParagraphTag( const TQString &t, int* alignment )
-{
-    TQString d = TQString( t );
-    if( d.startsWith("<p>") ) {
-        d = d.mid( 3, d.length() - 3 );
-    } else if( d.startsWith("<p ") ) {
-        *alignment = parseAlignment( parse( d, "align=\"", "\"", 0 ) );
-        if( d.contains( ">" ) ) {
-            int x = d.find(">" ) + 1;
-            d = d.mid( x, d.length() - x );
-        }
-    }
-
-    if( d.endsWith("</p>") )
-        d = d.left( d.length() - 4 ); // strlen("</p>");
-
-    return d;
-}
-
-#endif // TQT_TEXT_BUG
-
-
diff --git a/kbarcode/dsrichtext.h b/kbarcode/dsrichtext.h
deleted file mode 100644
index 8c56b56..0000000
--- a/kbarcode/dsrichtext.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/***************************************************************************
-                          dsrichtext.h  -  description
-                             -------------------
-    begin                : Fre Okt 17 2003
-    copyright            : (C) 2003 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef DSRICHTEXT_H
-#define DSRICHTEXT_H
-
-#define TQT_TEXT_BUG
-/*#undef TQT_TEXT_BUG*/
-#ifdef TQT_TEXT_BUG
-
-#include <tqcolor.h>
-#include <tqfont.h>
-#include <tqstring.h>
-#include <tqvaluelist.h>
-
-class DSRichText;
-
-/** This class represents one word,
-  * formated with a font, a color and an
-  * alignment.
-  */
-struct formated_word {
-    TQString text;
-    TQFont font;
-    TQColor color;
-    int alignment;
-    bool line;
-};
-
-typedef TQValueList<formated_word> WordList;
-
-/** This structure represents a single line.
-  * Every line contains a list of formated_words.
-  * Wordwrapping has been applied before the line
-  * was created.
-  * lineSpacing, ascent and leading come from the
-  * biggest font in the line.
-  */ 
-struct formated_line {
-    int width;
-    int lineSpacing;
-    int ascent;
-    int leading;
-    bool line;
-
-    WordList formats;
-};
-typedef TQValueList<formated_line> LineList;
-
-class TQColor;
-class TQPainter;
-
-/** A richtext rendering class, which draws a piece
-  * of HTML formated richtext on any TQPainter.
-  * This class works with all printer resolutions compared
-  * to the buggy TQSimpleRichText
-  *
-  * rendering the richtext happens in  3 steps:
-  * <ul>
-  * <li> the HTML data is parsed into text_format structures. Each
-  *       of these text_format structures may represend multiple lines, but
-  *       also single words. This depends on how long a formated text is.
-  *       this step happens in the constructor and in parseParagraph()</li>
-  * <li> the text_format structures are parsed into line structures.
-  *       In this step the wordwrapping is calculated. Each line structure
-  *       has again text_format structures. This is necessary because a line
-  *       of text may of course contain different formattings. A line struct is always
-  *       a single line of drawn text, not more and not less.
-  *       happens in draw() and fillLines()</li>
-  * <li> the line structure is drawn line by line using TQPainter.
-  *       happens in draw()</li>
-  * </ul>
-  *
-  * Printing to the screen is easy and the usage does not differ from
-  * TQSimpleRichText. Drawing on TQPrinter is a little bit more complicated.
-  * The most important thing is that you may not use TQPainter::scale().
-  * A small example on how to print on a TQPrinter:
-  * <pre>
-  *  TQPrinter printer( TQPrinter::HighResolution );
-  *  TQPainter painter( &printer );
-  *  TQPaintDeviceMetrics metrics( &printer );
-  *  double scalex = (double)metrics.logicalDpiX() / (double)TQPaintDevice::x11AppDpiX();
-  *  double scaley = (double)metrics.logicalDpiY() / (double)TQPaintDevice::x11AppDpiY();
-  *
-  *  DSRichText dsr( "&lt;html&gt;&lt;p&gt;Hallo World&lt;/p&gt;&lt;/html&gt;" );
-  *  dsr.setWidth( 200 ); // in screenresolution coordinates
-  *  dsr.setHeight( 80 );  // in screenresolution coordinates
-  *  painter.translate( 10 * scalex, 10 * scaley ); // draw at 10, 10 instead of 0, 0
-  *  dsr.scale( scalex, scaley );
-  *  dsr.draw( &painter );
-  * </pre>
-  *
-  *@author Dominik Seichter
-  */
-class DSRichText {
-    public:
-        /** construct a DSRichText object. @p t is formated text as produces by TQTextEdit.
-          */
-        DSRichText( const TQString & t );
-        ~DSRichText();
-
-        void setX( int x );
-        void setY( int y );
-        
-        /** draw the formated text on the TQPainter* @p p
-          */
-        void draw( TQPainter* p );
-        /** set the width of the clipping rectangle
-          */
-        void setWidth( int width );
-        /** set the height of the clipping rectangle
-          */
-        void setHeight( int height );
-        /** scale everything. This is necessary to print on devices
-          * with another resolution than the screen. TQPainter::scale() won't work.
-          */
-        void setScale( double x, double y ) {
-            sx = x; sy = y;
-        };
-
-    private:
-        /** parse a single pare of <p></p> elements
-          */
-        bool parseParagraph();
-        /** remove <p> and </p> from the TQString @p t and return it.
-          * This function is also responsible for getting the
-          * correct alignment of the paragraph.
-          */
-        TQString parseParagraphTag( const TQString & t, int* alignment );
-        /** parse the align attribute of a <p> tag and return the corresponding TQt alignment value.
-          */
-        int parseAlignment( const TQString & align );
-        /** parse the css style attribute of a <span> tag and return a matching TQFont for these
-          * style. The font color is saved in the TQColor* @p color.
-          */
-        TQFont parseStyle( const TQString & s, TQColor* color );
-        TQString parse( const TQString & t, const TQString & find, const TQString & end, int start );
-        void parseWords( const TQString & t, formated_word* w, WordList* words );
-        void initFormat( formated_word* f, int alignment );
-        void initLine( TQValueList<formated_line>* l );
-        void updateSpacing( TQValueList<formated_line>* l, TQFontMetrics* fm );
-        /** draw the line @p line justified as blockquote
-          */
-        void drawJustified( formated_line* line );
-        /** calculate the y-deviation needed, because of different font sizes in this line
-          */
-        inline int yDeviation( const formated_line* line );
-        /** replace HTML escape sequences such as &lt; to their real character meaning (i.e. < )
-          */
-        TQString replaceEscapeSequences( const TQString & t );
-
-        /** fill the line structures with data
-          */
-        void fillLines();
-
-        int pos; // current position in text
-        int start; // start of a tag
-        int end; // end of a tag
-        int x; // x position
-        int y; // y position
-        int w; // width of the text element
-        int h; // height of the text element
-        int xpos; // x position at the beginning
-        int ypos; // y position at the beginning
-        
-        double sx;
-        double sy;
-        
-        TQString text;
-        TQFont m_base;
-        TQColor m_color;
-        TQPainter* painter;
-
-        TQValueList<LineList> line_p;
-        TQValueList<WordList> word_p;
-};
-
-#endif // TQT_TEXT_BUG
-#endif
diff --git a/kbarcode/dstextedit.cpp b/kbarcode/dstextedit.cpp
index 87f93d7..9a51d8f 100644
--- a/kbarcode/dstextedit.cpp
+++ b/kbarcode/dstextedit.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 DSTextEdit::DSTextEdit( TQWidget* parent, const char* name )
-    : TextEditBase( parent, name )
+    : KTextEdit( parent, name )
 {
     connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
 }
diff --git a/kbarcode/dstextedit.h b/kbarcode/dstextedit.h
index 0e4b1dd..75a0903 100644
--- a/kbarcode/dstextedit.h
+++ b/kbarcode/dstextedit.h
@@ -18,26 +18,26 @@
 #ifndef _DS_TEXT_EDIT_H_
 #define _DS_TEXT_EDIT_H_
 
-#include <tqnamespace.h> 
+#include <tqnamespace.h>
 
 #include <ktextedit.h>
 
 // Otherwise moc will complain
 #define TextEditBase KTextEdit
 
-class DSTextEdit : public TextEditBase {
+class DSTextEdit : public KTextEdit {
     Q_OBJECT
-  
-        
+
+
   public:
     DSTextEdit( TQWidget* parent, const char* name = 0 );
 
     //virtual void moveCursor( CursorAction action, bool select );
   private slots:
     void fixParagraphs();
-      
+
   private:
-    /** 
+    /**
      * returns true if the cursor is currently inside
      * of a token of the form [value].
      */
diff --git a/kbarcode/labelutils.cpp b/kbarcode/labelutils.cpp
index b83cb9e..73f5a3b 100644
--- a/kbarcode/labelutils.cpp
+++ b/kbarcode/labelutils.cpp
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 #include "labelutils.h"
-#include "dsrichtext.h" 
 
 // TQt includes
 #include <tqbitmap.h>
@@ -108,81 +107,70 @@ TQSize LabelUtils::stringSize( const TQString & t )
     return s;
 }
 
-void LabelUtils::renderString( TQPainter* painter, const TQString & t, const TQRect & rect, double scalex, double scaley )
+TQPixmap* LabelUtils::drawString(const TQString & t, int w, int h, double rot)
 {
-    // DSRichText cannot calculate the width on its own
-    TQSimpleRichText srt( t, TDEApplication::font() );
-    int width = (rect.width() > 0) ? rect.width() : srt.widthUsed();
-    int height = (rect.height() > 0) ? rect.height() : srt.height();
-    
-    DSRichText r( t );
-    r.setX( rect.x() );
-    r.setY( rect.y() );
-    r.setWidth( width );
-    r.setHeight( height );
-    r.setScale( scalex, scaley );
-    r.draw( painter );    
-}
-
-TQPixmap* LabelUtils::drawString( const TQString & t, int w, int h, double rot )
-{
-    TQSimpleRichText srt( t, TDEApplication::font() );
+    TQSimpleRichText srt(t, TDEApplication::font());
 
     int width = (w > 0) ? w : srt.widthUsed();
     int height = (h > 0) ? h : srt.height();
     srt.setWidth( width );
-    
+
     TQPixmap* pix;
     TQPainter painter;
-    if( rot == 0.0 ) {
-        TQBitmap bm( width, height );
-        bm.fill( TQt::color0 ); //transparent
-        painter.begin( &bm );
-    
-          painter.save();
-            painter.setPen( TQt::color1 );
-            TQColorGroup cg;
-            cg.setColor( TQColorGroup::Foreground, TQt::color1 );
-              cg.setColor( TQColorGroup::Text, TQt::color1 );
-              cg.setColor( TQColorGroup::Base, TQt::color0 );
-    
-            srt.draw( &painter, 0, 0, bm.rect(), cg );
-          painter.restore();
+
+    if (rot == 0.0)
+    {
+        TQBitmap bm(width, height);
+        bm.fill(TQt::color0);   //transtqparent
+        painter.begin(&bm);
+
+        painter.save();
+        painter.setPen(TQt::color1);
+        TQColorGroup cg;
+        cg.setColor(TQColorGroup::Foreground, TQt::color1);
+        cg.setColor(TQColorGroup::Text, TQt::color1);
+        cg.setColor(TQColorGroup::Base, TQt::color0);
+
+        srt.draw(&painter, 0, 0, bm.rect(), cg);
+        painter.restore();
         painter.end();
-        
-        pix = new TQPixmap( width, height );
-        pix->fill( TQt::white );
-        pix->setMask( bm );
-            
-        if( !pix->isNull() ) {
-            painter.begin( pix );
-            painter.setPen( TQt::black );
+
+        pix = new TQPixmap(width, height);
+        pix->fill(TQt::white);
+        pix->setMask(bm);
+
+        if (!pix->isNull())
+        {
+            painter.begin(pix);
+            painter.setPen(TQt::black);
             TQColorGroup cg;
-            srt.draw( &painter, 0, 0, pix->rect(), cg );
+            srt.draw(&painter, 0, 0, pix->rect(), cg);
             painter.end();
-        } 
-    } else {
+        }
+    }
+    else
+    {
         int w2 = (w > 0) ? w : srt.widthUsed();
         int h2 = (h > 0) ? h : srt.height();
 
         TQWMatrix wm;
-        wm.rotate( rot );
+        wm.rotate(rot);
 
-        TQSize s = LabelUtils::stringSize( t );
-        TQPixmap* tmp = LabelUtils::drawString( t, s.width(), s.height() );
+        TQSize s = LabelUtils::stringSize(t);
+        TQPixmap* tmp = LabelUtils::drawString(t, s.width(), s.height());
 
-        TQPixmap* p = new TQPixmap( w2, h2 );
-        p->fill( TQt::white );
-        painter.begin( p );
-        painter.drawPixmap( 0, 0, tmp->xForm( wm ) );
+        TQPixmap* p = new TQPixmap(w2, h2);
+        p->fill(TQt::white);
+        painter.begin(p);
+        painter.drawPixmap(0, 0, tmp->xForm(wm));
         painter.end();
 
-        p->setMask( p->createHeuristicMask() );
+        p->setMask(p->createHeuristicMask());
 
         pix = p;
         delete tmp;
     }
-    
+
     return pix;
 }
 
diff --git a/kbarcode/labelutils.h b/kbarcode/labelutils.h
index 777a0af..88e352e 100644
--- a/kbarcode/labelutils.h
+++ b/kbarcode/labelutils.h
@@ -52,7 +52,6 @@ class LabelUtils {
         static TQPixmap* drawString( const TQString & t ) {
             return LabelUtils::drawString( t, 0, 0, 0 );
         }
-        static void renderString( TQPainter* painter, const TQString & t, const TQRect & r, double scalex, double scaley );
 
         const TQString getTypeFromCaption( const TQString & cap );
         const TQString getModeFromCaption( const TQString & cap );
diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp
index 9663059..60cb981 100644
--- a/kbarcode/main.cpp
+++ b/kbarcode/main.cpp
@@ -108,6 +108,8 @@ int main(int argc, char *argv[])
     aboutData.addCredit("John Volpe", I18N_NOOP("Added lot's of useful data fields to kbarcode"), "[email protected]" );
     aboutData.addCredit("Nyssa s.r.l.", I18N_NOOP("Added TEC barcode printer support"), "[email protected]", "http://www.nyssa.com.ar" );
     aboutData.addCredit("Brian Glass", I18N_NOOP("Added EPCL barcode printer support"), "[email protected]", "http://www.glassbrian.com" );
+    aboutData.addCredit("Váradi Zsolt Gyula", I18N_NOOP("Wrote bugfixes."), "[email protected]");
+    aboutData.addCredit("Timothy Pearson", I18N_NOOP("Maintainer (TDE project)"), "[email protected]");
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
@@ -119,7 +121,7 @@ int main(int argc, char *argv[])
     a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()));
 
     KBarcode* kbc = new KBarcode( 0, "KBarcodeMainWindow" );
-    
+
     if( kbc->parseCmdLine() )
         return 0;
     else
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 65ead7b..18a7acf 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -20,7 +20,6 @@
 
 // KDE includes
 #include <tdeaction.h>
-#include <tdeversion.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <tdelocale.h>
@@ -149,9 +148,6 @@ void MultiLineEditor::setupActions()
     action_italic->plug( toolBar );
     action_underline->plug( toolBar );
     toolBar->insertSeparator();
-//#if KDE_IS_VERSION( 3, 1, 90 )
-//    action_spell->plug( toolBar );
-//#endif
            
     action_font->plug( tool2Bar );
     action_font_size->plug( tool2Bar );
@@ -271,6 +267,7 @@ void MultiLineEditor::insertNewField()
 
 void MultiLineEditor::checkSpelling()
 {
+// FIXME: check and clean up spellchecking (Zsolt, 2008-04-07)
 /*
 #if KDE_IS_VERSION( 3, 1, 90 )
     TQString s;
diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp
deleted file mode 100644
index 48d6735..0000000
--- a/kbarcode/mybarcode.cpp
+++ /dev/null
@@ -1,620 +0,0 @@
-f/***************************************************************************
-                          barcode.cpp  -  description
-                             -------------------
-    begin                : Die Apr 23 2002
-    copyright            : (C) 2002 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "sqltables.h"
-#include "barcodecache.h"
-
-#include "mybarcode.h"
-#include <stdio.h>
-
-// TQt includes
-#include <tqdir.h>
-#include <tqpainter.h>
-#include <tqpaintdevicemetrics.h>
-#include <tqsqlquery.h>
-
-// KDE includes
-#include <tdeapplication.h>
-#include <tdeconfig.h>
-#include <tdelocale.h>
-#include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
-#include <tdetempfile.h>
-
-#define BARCODE_MARGIN 10     /* Margin added by GNU Barcode to the barcodes */
-
-TQValueList<barcodeFormat> codes;
-
-void init() {
-    BarCode::setHaveBarcode();
-}
-
-bool barcodeData::operator==( const struct barcodeData d ) const {
-    bool b = ( value == d.value && type == d.type &&
-               scale == d.scale && text == d.text );
-
-    if( BarCode::hasFeature( type, TBARCODEADV ) )
-        b = ( b && tbarcode == d.tbarcode );
-
-    if( BarCode::hasFeature( type, DATAMATRIX ) )
-        b = ( b && datamatrix == d.datamatrix );
-
-    if( BarCode::hasFeature( type, PDF417BARCODE ) )
-        b = ( b && pdf417 == d.pdf417 );
-
-    return b;
-};
-
-BarCode::BarCode( const barcodeData* data )
-{
-    barcode = *data;
-    m_index = 0;
-}
-
-BarCode::BarCode()
-{
-    fillDefault( &barcode );
-    m_index = 0;    
-}
-
-BarCode::~BarCode()
-{
-}
-
-const TQPixmap BarCode::pixmap()
-{
-    if( p.isNull() )
-        createBarcode( &p, TDEApplication::desktop() );
-
-    if( p.isNull() ) {
-        KMessageBox::error( 0, "<qt>" + i18n("Barcode not valid!") + "<br>" + barcode.value + "</qt>" );
-        barcode.valid = false;
-    }
-        
-    return p;
-}
-
-bool BarCode::createPixmap( TQPixmap* target, int resx, int resy )
-{
-    KTempFile* output = new KTempFile( TQString(), ".ps" );;
-    output->file()->close();
-    
-    KTempFile* input = new KTempFile( TQString(), ".pbm" );
-    input->file()->close();
-
-    m_value = createSequence( barcode.value );
-
-    if( BarCode::hasFeature( barcode.type, PDF417 ) ) {
-        if(!createPdf417( output )) {
-            cleanUp( output, input, target );
-            return false;
-        }
-    } else if( BarCode::hasFeature( barcode.type, TBARCODE ) ) {
-        if(!createTBarcode( output )) {
-            cleanUp( output, input, target );
-            return false;
-        }
-    } else { // if( BarCode::hasFeature( barcode.type, GNU_BARCODE ) ) {
-        TQString flag = barcode.text ? "" : "-n";
-
-        KShellProcess proc;
-        proc << "barcode" << "-E"
-             << "-b" << KShellProcess::quote( m_value ) << flag
-             << "-e" << barcode.type << "-o" << output->name();
-
-        proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
-        proc.resume();
-
-        if( proc.exitStatus() ) {
-            cleanUp( output, input, target );
-            return false;
-        }
-    }
-
-    TQFileInfo fi( output->name() );
-    // if file size = 0, error in generation
-    if( !fi.size() ) {
-        cleanUp( output, input, target );
-        return false;
-    }
-
-    TQSize s = getBoundingBox( output->name() );
-    double sw = (double)s.width()/72 * resx;
-    double sh = (double)s.height()/72 * resy;
-    
-    KShellProcess proc2;
-    proc2 << "gs" << TQString("-g%1x%2").arg(int(sw*(double)barcode.scale)).arg(int(sh*(double)barcode.scale))
-          << "-r" + TQString::number( resx*(double)barcode.scale ) + "x" + TQString::number( resy*(double)barcode.scale )
-          << "-sDEVICE=pbmraw" << "-sOutputFile=" + input->name() << "-sNOPAUSE"
-          << "-q " + output->name() << "-c showpage" << "-c quit";
-    
-    proc2.start( TDEProcess::Block, TDEProcess::NoCommunication );
-    proc2.resume();
-
-    if( proc2.exitStatus() ) {
-        cleanUp( output, input, target );
-        return false;
-    }
-
-    target->load( input->name(), "PBM" );
-//    BarcodeCache::instance()->write( barcode, resx, resy, target, m_value );
-
-    input->unlink();
-    output->unlink();
-
-    delete output;
-    delete input;
-
-    return true;
-}
-
-void BarCode::createBarcode( TQPixmap* target, TQPaintDevice* device )
-{
-    TQPaintDeviceMetrics pdm( device );
-    int resx = pdm.logicalDpiX();
-    int resy = pdm.logicalDpiY();
-
-    TQString value = createSequence( barcode.value );
-    TQPixmap* cached = 0;//BarcodeCache::instance()->read( barcode, resx, resy, value );
-
-    // no matching barcode found in cache
-    if( !cached ) {
-        if( !createPixmap( target, resx, resy ) )
-            return;
-    } else {
-        *target = *cached;
-        delete cached;
-    }
-    
-    if( BarCode::hasFeature( barcode.type, PDF417 ) ) {
-        // we have to scale to the correct resolution.
-        // we scale already here and not at the end,
-        // so that the addMargin function does not get a scaled margin.
-        TQPaintDeviceMetrics pdm( TDEApplication::desktop() );
-        int screenresx = pdm.logicalDpiX();
-        int screenresy = pdm.logicalDpiY();
-    
-        TQWMatrix m;
-        double scalex = (resx/screenresx)*barcode.scale;
-        double scaley = (resy/screenresy)*barcode.scale;
-        m.scale( scalex, scaley );
-        *target = target->xForm( m );
-    }
-    *target = cut( target, barcode.cut );
-    *target = addMargin( target, barcode.margin );
-
-    // Rotate
-    TQWMatrix m;
-    m.rotate( (double)barcode.rotation );
-    *target = target->xForm( m );
-
-    barcode.valid = true;
-}
-
-bool BarCode::createPdf417( KTempFile* output )
-{
-    KTempFile text( TQString(), ".txt" );
-    TQTextStream t( text.file() );
-    t << m_value;
-    text.file()->close();
-
-    // ps does not work use pbm!
-    KShellProcess proc;
-    proc << "pdf417_enc" << "-tps" << text.name() << output->name()
-         << barcode.pdf417.row
-         << barcode.pdf417.col
-         << barcode.pdf417.err;
-         
-    proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
-    proc.resume();
-
-    if( proc.exitStatus() ) {
-        text.unlink();
-        return false;
-    }
-
-    text.unlink();    
-    return true;    
-}
-
-bool BarCode::createTBarcode( KTempFile* output )
-{
-    // print text
-    TQString flag = barcode.text ? "" : "n";
-    // escape text
-    flag.append( barcode.tbarcode.escape ? " son" : " soff" );
-    // autocorrection
-    flag.append( barcode.tbarcode.autocorrect ? " Aon" : " Aoff" );
-    // text above
-    flag.append( barcode.tbarcode.above ? " a" : "" );
-    
-    KShellProcess proc;
-    proc << "tbarcodeclient" << "-f" + output->name();
-    if( !BarCode::hasFeature( barcode.type, BARCODE2D ) )
-        proc << TQString( "m%1" ).arg( barcode.tbarcode.modulewidth * 1000 );
-
-    if( BarCode::hasFeature( barcode.type, DATAMATRIX ) ) 
-        proc << TQString( "Ds%1" ).arg( barcode.datamatrix.size );
-
-    if( BarCode::hasFeature( barcode.type, PDF417BARCODE ) )
-        proc << TQString( "Pr%1 Pc%2 Pe%3" ).arg( barcode.pdf417.row )
-                                           .arg( barcode.pdf417.col )
-                                           .arg( barcode.pdf417.err );
-        
-    proc << barcode.type << "tPS" << TQString("c%1").arg( barcode.tbarcode.checksum ) << flag << "d" + KShellProcess::quote(  m_value );
-    proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
-    proc.resume();
-
-    if( proc.exitStatus() )
-        return false;
-
-    return true;
-}
-
-const TQPixmap BarCode::printerPixmap( TQPaintDevice* device )
-{
-    if( pp.isNull() )
-        createBarcode( &pp, device );
-    
-    return pp;
-}
-
-void BarCode::fillDefault( barcodeData* data )
-{
-    data->margin = 10;
-    data->text = true;
-    data->value = "1234567890";
-    data->type = "code39";
-    data->scale = 1.0;
-    data->cut = 1.0;
-    data->rotation = 0;
-    data->valid = false;
-
-    data->pdf417.row = 24;
-    data->pdf417.col = 8;
-    data->pdf417.err = 5;
-
-    data->datamatrix.size = 0;
-
-    data->tbarcode.modulewidth = 0.353;
-    data->tbarcode.escape = false;
-    data->tbarcode.above = false;
-    data->tbarcode.autocorrect = false;
-    data->tbarcode.checksum = 0;
-        
-    data->xml.caption = "Static";
-    data->xml.x = 0;
-    data->xml.y = 0;
-
-    data->sequence.enabled = false;
-    data->sequence.mode = NUM;
-    data->sequence.step = 1;
-    data->sequence.start = 1;
-}
-
-void BarCode::redrawBarcode()
-{
-    p.resize( 0, 0 );
-    pp.resize( 0, 0 );
-}
-
-TQPixmap BarCode::cut( TQPixmap* pic, double cut)
-{
-    if( cut == 1.0 )
-        return (*pic);
-
-    TQPixmap pcut( pic->width(), int((double)pic->height() * cut) );
-    pcut.fill( TQt::white ); // barcode.bg
-
-    TQWMatrix m;
-    /*
-     * if text is above the barcode cut from
-     * below the barcode.
-     */
-
-    // TODO: put this into one if, I am to stupid today.....
-    if( BarCode::hasFeature( barcode.type, TBARCODEADV ) ) {
-        if( !barcode.tbarcode.above )
-            m.rotate( 180 );
-    } else
-        m.rotate( 180 );
-
-    TQPainter painter( &pcut );
-    painter.drawPixmap( 0, 0, pic->xForm( m ) );
-
-    return pcut.xForm( m );
-}
-
-TQPixmap BarCode::addMargin( TQPixmap* pic, int margin )
-{
-    TQPixmap p;
-
-    /* We have to handle UPC special because of the checksum character
-     * which is printed on the right margin.
-     * The samve goes for ISBN codes.
-     * Any other formats??
-     */
-
-    bool gnubarcode = BarCode::hasFeature( barcode.type, GNU_BARCODE );
-    double barm = gnubarcode ? BARCODE_MARGIN * barcode.scale : 0;
-
-    // Add margin
-    double sx = barm;
-    double sy = barm;
-    double sw = pic->width() - barm * 2;
-    double sh = pic->height() - barm * 2;
-
-    if( gnubarcode && (barcode.type == "upc" || barcode.type == "isbn") ) {
-        sw = pic->width() - barm;
-
-        p.resize( pic->width() + int(margin*2 - barm), pic->height() + int(margin * 2 - barm * 2) );
-    } else
-        p.resize( pic->width() + int(margin*2 - barm * 2), pic->height() + int(margin * 2 - barm * 2) );
-
-    p.fill( TQt::white ); // barcode.bg
-    TQPainter painter( &p );
-    painter.drawPixmap( margin, margin, *pic, (int)sx, (int)sy, (int)sw, (int)sh );
-    painter.end();
-
-    return p;
-}
-
-const TQString BarCode::getMaxLength( const TQString & name )
-{
-    TQSqlQuery query("select uid, (length(barcode_no)) as LEN from " TABLE_BASIC
-        " where encoding_type = '" + name +"' ORDER by LEN DESC LIMIT 1" );
-
-    while( query.next() ) {
-        TQSqlQuery queryuid("select barcode_no from barcode_basic where uid = '"
-            + query.value( 0 ).toString() + "'" );
-        while( queryuid.next() )
-            if(!queryuid.value( 0 ).toString().isEmpty())
-                return queryuid.value( 0 ).toString();
-    }
-
-    TQSqlQuery query1("select uid, (length(barcode_no)) as LEN from " TABLE_CUSTOMER_TEXT 
-                    " where encoding_type = '" + name +"' ORDER by LEN DESC LIMIT 1" );
-
-    while( query1.next() ) {
-        TQSqlQuery queryuid("select barcode_no from customer_text where uid = '"
-            + query1.value( 0 ).toString() + "'" );
-        while( queryuid.next() )
-            if(!queryuid.value( 0 ).toString().isEmpty())
-                return queryuid.value( 0 ).toString();
-    }
-
-    return "1234567";        
-}
-
-void BarCode::cleanUp( KTempFile* file, KTempFile* file2, TQPixmap* target )
-{
-    target->resize( 0, 0 );
-
-    file->unlink();
-    file2->unlink();
-    delete file;
-    delete file2;
-}
-
-TQString BarCode::createSequence( const TQString & value )
-{
-    if( !barcode.sequence.enabled )
-        return value;
-        
-    if( value.contains( '#' ) <= 0 )
-        return value;
-
-    TQString text = value;
-    int pos = 0, counter = 1;
-
-    pos = text.find("#", pos);
-    pos++;
-    while( text[pos] == '#' ) {
-        text.remove(pos, 1);
-        counter++;
-    }
-
-    pos = text.find("#", 0);
-    TQString temp;
-
-    if( barcode.sequence.mode == NUM ) {
-        int v = barcode.sequence.start + m_index*barcode.sequence.step;
-        temp.sprintf("%0*i", counter, v );
-    } else {
-        for( int i = 0; i < counter; i++ )
-            temp.append( "A" );
-
-        unsigned int z = 0;
-        for( int p = temp.length(); p >= 0; p--, z++ ) {
-            if( barcode.sequence.mode == ALPHA ) {
-                int v = 'A' + m_index*barcode.sequence.step;
-                v -= z*('Z'-'A');
-            
-                if( v <= 'Z' ) {
-                    temp[p] = TQChar(v);                        
-                    break;
-                } else if( v > 'Z' )
-                    v = 'Z';
-                temp[p] = TQChar(v);            
-            } else if( barcode.sequence.mode == ALPHANUM ) {
-                tqDebug("NOT IMPLEMENTED");
-/*                char array[36];
-                for( unsigned int i = 'A'; i <= 'Z'; i++ )
-                    array[i-'A'] = i;
-                for( unsigned int i = '0'; i <= '9'; i++ )
-                    array['Z'-'A'+i-'0'] = i;
-
-                int z = m_index*barcode.sequence.step;
-                if( z < sizeof(array) )
-                    temp[]
-                int v = array[ ]*/
-            }
-        }
-    }
-    
-    text.replace( pos, 1, temp);
-
-    return text;
-}
-
-TQString BarCode::sequenceValue()
-{
-    return createSequence( barcode.value );
-}
-
-bool BarCode::hasFeature( const TQString & type, unsigned int feature )
-{
-    for( unsigned int i = 0; i < codes.count(); i++ )
-        if( codes[i].name == type )
-            return (codes[i].features & feature) == feature;
-            
-    return false;
-}
-
-TQSize BarCode::getBoundingBox( const TQString & filename )
-{ 
-    TQSize s(0,0);
-    TQFile f( filename );
-    if( !f.open( IO_ReadOnly ) )
-        return s;
-        
-    TQString t;
-    while( f.readLine( t, 1000 ) != -1 )
-    {
-        if( t.startsWith( "%%BoundingBox:") )
-        {
-            int x = 0;
-            int y = 0;
-            int w = 0;
-            int h = 0;
-            t = t.right( t.length() - 14 );
-            sscanf( (const char*)t, "%d %d %d %d", &x, &y, &w, &h );
-            s = TQSize( w, h );
-            break;
-        }
-    }
-
-    f.close();
-    return s;
-}
-
-bool BarCode::m_haveGnuBarcode = false;
-bool BarCode::m_havePdfEncode = false;
-bool BarCode::m_haveTBarcode = false;
-
-barcodeFormat BarCode::fillStruct( const TQString & name, const TQString & text, const int feature )
-{
-    barcodeFormat t;
-    t.name = name;
-    t.text = text;
-    t.features = feature;
-    return t;
-}
-
-void BarCode::setHaveBarcode()
-{
-    m_haveGnuBarcode = !TDEStandardDirs::findExe( "barcode" ).isNull();
-    m_havePdfEncode = !TDEStandardDirs::findExe( "pdf417_enc" ).isNull();
-    m_haveTBarcode = !TDEStandardDirs::findExe( "tbarcodeclient" ).isNull();
-
-    if( codes.count() == 0 ) {
-        if( m_haveGnuBarcode ) {
-            codes.append( fillStruct( "ean", i18n("EAN (EAN 8 or EAN 13)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "upc", i18n("UPC (12-digit EAN; UPCA and UPCB)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "isbn", i18n("ISBN (still EAN13)"), GNU_BARCODE | NOCUT  ) );
-            codes.append( fillStruct( "code39", i18n("Code 39"), GNU_BARCODE ) );
-            codes.append( fillStruct( "code39 -c", i18n("Code 39 (no checksum)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "code128", i18n("Code 128 (a,b,c: autoselection)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "code128c", i18n("Code 128C (compact form digits)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "code128b", i18n("Code 128B, full printable ascii"), GNU_BARCODE ) );
-            codes.append( fillStruct( "i25", i18n("interleaved 2 of 5 (only digits)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "i25 -c", i18n("interleaved 2 of 5 (only digits, no checksum)"), GNU_BARCODE ) );
-            codes.append( fillStruct( "128raw", i18n("Raw code 128"), GNU_BARCODE ) );
-            codes.append( fillStruct( "cbr", i18n("Codabar"), GNU_BARCODE ) );
-            codes.append( fillStruct( "cbr -c", i18n("Codabar (no checksum)"), GNU_BARCODE ) );            
-            codes.append( fillStruct( "msi", i18n("MSI"), GNU_BARCODE ) );
-            codes.append( fillStruct( "pls", i18n("Plessey"), GNU_BARCODE ) );
-            codes.append( fillStruct( "code93", i18n("Code 93"), GNU_BARCODE ) );
-        }
-
-        if( m_havePdfEncode ) {
-            codes.append( fillStruct( "pdf417", i18n("pdf 417 2D Barcode"), BARCODE2D | PDF417 | PDF417BARCODE ) );
-        }
- 
-        if( m_haveTBarcode ) {
-            codes.append( fillStruct( "b1", "Code 11", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b2", "Code 2 of 5 (Standard)", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b3", "Interleaved 2 of 5 Standard", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b4", "Code 2 of 5 IATA", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b5", "Code 2 of 5 Matrix", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b6", "Code 2 of 5 Data Logic", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b7", "Code 2 of 5 Industrial", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b8", "Code 3 of 9 (Code 39)", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b9", "Code 3 of 9 (Code 39) ASCII", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b10", "EAN8", TBARCODE | TBARCODEADV | EAN8CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b11", "EAN8 - 2 digits add on", TBARCODE | NOCUT | TBARCODEADV | EAN8CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b12", "EAN8 - 5 digits add on", TBARCODE | NOCUT | TBARCODEADV | EAN8CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b13", "EAN13", TBARCODE | TBARCODEADV | EAN13CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b14", "EAN13 - 2 digits add on", TBARCODE | NOCUT | TBARCODEADV | EAN13CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b15", "EAN13 - 5 digits add on", TBARCODE | NOCUT | TBARCODEADV | EAN13CHECK | MODULO10CHECK ) );
-            codes.append( fillStruct( "b16", "EAN128 (supports AIS)", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b17", "UPC 12 Digits", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b18", "CodaBar (2 width)", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b19", "CodaBar (18 widths)", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b20", "Code128", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b21", "Deutsche Post Leitcode", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b22", "Deutsche Post Identcode", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b25", "Code 93", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b26", "Identical to eBC_UPCA", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b33", "UCC128 (= EAN128)", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b34", "UPC A", TBARCODE | TBARCODEADV | TBARCODEADV | UPCACHECK ) );
-            codes.append( fillStruct( "b35", "UPC A - 2 digit add on", TBARCODE | TBARCODEADV | UPCACHECK ) );
-            codes.append( fillStruct( "b36", "UPC A - 5 digit add on", TBARCODE | TBARCODEADV | UPCACHECK ) );
-            codes.append( fillStruct( "b37", "UPC E", TBARCODE | TBARCODEADV | UPCECHECK ) );
-            codes.append( fillStruct( "b38", "UPC E - 2 digit add on", TBARCODE | TBARCODEADV | UPCECHECK ) );
-            codes.append( fillStruct( "b39", "UPC E - 5 digit add on", TBARCODE | TBARCODEADV | UPCECHECK ) );
-            codes.append( fillStruct( "b40", "PostNet ZIP (5d.)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b41", "PostNet ZIP (5d.+CD)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b42", "PostNet ZIP (8d.)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b43", "PostNet ZIP+4 (5d.+4d.+CD)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b44", "PostNet DPBC (5d.+4d.+2d.)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b45", "PostNet DPBC (5d.+4d.+2d.+CD)", TBARCODE | NOCUT | TBARCODEADV | POSTNETCHECK ) );
-            codes.append( fillStruct( "b46", "Plessey Code", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b47", "MSI Code", TBARCODE | TBARCODEADV | MODULO10CHECK ) );
-            codes.append( fillStruct( "b50", "LOGMARS", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b55", "PDF417 - 2D bar code", TBARCODE | BARCODE2D | PDF417BARCODE ) );
-            codes.append( fillStruct( "b56", "PDF417 Truncated - 2D bar code", TBARCODE | BARCODE2D | PDF417BARCODE ) );
-            codes.append( fillStruct( "b57", "MaxiCode - 2D-bar code (Postscript only)", TBARCODE | BARCODE2D ) );
-            codes.append( fillStruct( "b58", "QR-Code", TBARCODE | BARCODE2D ) );
-            codes.append( fillStruct( "b59", "Code128 (CharSet A)", TBARCODE | TBARCODEADV | CODE128CHECK | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b60", "Code128 (CharSet B)", TBARCODE | TBARCODEADV | CODE128CHECK | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b61", "Code128 (CharSet C)", TBARCODE | TBARCODEADV | CODE128CHECK | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b62", "Code 93 Ascii", TBARCODE | TBARCODEADV | MODULOALLCHECK ) );
-            codes.append( fillStruct( "b63", "Australian Post Standard Customer", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b64", "Australian Post Customer 2", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b65", "Australian Post Customer 3", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b66", "Australian Post Reply Paid", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b67", "Australian Post Routing", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b68", "Australian Post Redirection", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b69", "ISBN Code (=EAN13P5)", TBARCODE | TBARCODEADV ) );
-            codes.append( fillStruct( "b70", "Royal Mail 4 State (RM4SCC)", TBARCODE | NOCUT | TBARCODEADV ) );
-            codes.append( fillStruct( "b71", "Data Matrix", DATAMATRIX | TBARCODE | BARCODE2D | NOSCALE ) );
-        }
-    }
-}
-
diff --git a/kbarcode/mybarcode.h b/kbarcode/mybarcode.h
deleted file mode 100644
index ae12782..0000000
--- a/kbarcode/mybarcode.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/***************************************************************************
-                         mybarcode.h  -  description
-                             -------------------
-    begin                : Die Apr 23 2002
-    copyright            : (C) 2002 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef MY_BARCODE_H
-#define MY_BARCODE_H
-
-#include <tqpixmap.h>
-#include <tqobject.h>
-
-#include <tqvaluelist.h>
-#include "barkode.h"
-void init();
-
-typedef union u_settings {
-    struct {
-        int row;
-        int col;
-        int err;
-    } pdf417;
-
-    struct {
-        int size;
-    } datamatrix;
-
-    struct {
-        double modulewidth;
-        bool escape;
-    } tbarcode;
-};
-
-class TQColor;
-class TQString;
-typedef struct barcodeData {
-    TQString value;
-    TQString type;
-    int margin;
-    int rotation;
-    double scale;
-    double cut;
-    bool text;
-    bool valid;
-
-    struct _pdf417 {
-        int row;
-        int col;
-        int err;
-
-        bool operator==( const struct _pdf417 p ) const {
-            return row == p.row && col == p.col && err == p.err;
-        };
-        
-    } pdf417;
-
-    struct _datamatrix {
-        int size;
-
-        bool operator==( const struct _datamatrix d ) const {
-            return size == d.size;
-        };
-        
-    } datamatrix;
-
-    struct _tbarcode {
-        double modulewidth;
-        bool escape;
-        bool above;
-        bool autocorrect;
-        int checksum;
-
-        bool operator==( const struct _tbarcode t ) const {
-            return modulewidth == t.modulewidth && escape == t.escape && above == t.above && checksum == t.checksum && autocorrect == t.autocorrect;
-        };
-        
-    } tbarcode;
-
-    struct {
-        // only important
-        // when this struct
-        // is read from XML
-        TQString caption;
-        int x;
-        int y;
-    } xml;
-
-    /**
-      * Compare to barcodeData structs,
-      * but only the fields which are used
-      * as commandline parameters for
-      * the genaration backends.
-      * E.g. margin is not compared, because
-      * the margin is created by KBarcode internally.
-      */
-    bool operator==( const struct barcodeData d ) const;
-
-    struct {
-        bool enabled;
-        int mode;
-        int step;
-        int start;
-    } sequence;
-};
-
-#if 0
-enum { NOCUT = 0x00001, MULTILINE = 0x00002, NOTEXT = 0x00004, NOSCALE = 0x00008,
-       /**
-         * The different Generator Backends
-         */
-       GNU_BARCODE = 0x00010, PDF417 = 0x00020, TBARCODE = 0x00040,
-       /**
-         * Different advanced option modes.
-         */
-       DATAMATRIX = 0x00080, PDF417BARCODE = 0x00100, TBARCODEADV = 0x00200,
-       /**
-         * Checksum ID's
-         */
-       POSTNETCHECK = 0x01000, CODE128CHECK = 0x02000, EAN8CHECK = 0x04000, EAN13CHECK = 0x08000,
-       UPCACHECK = 0x10000, UPCECHECK = 0x20000, MODULOALLCHECK = 0x40000, MODULO10CHECK = 0x80000,
-       /**
-         * Short cut's
-         */
-       BARCODE2D =  NOCUT | MULTILINE | NOTEXT };
-#endif
-
-typedef struct barcodeFormat {
-    TQString name;
-    TQString text;
-    unsigned int features;
-};
-
-class TDEProcess;
-class KTempFile;
-class TQPaintDevice;
-/**
-  * This class creates a TQPixmap from a barcodeData struct.
-  * Several backends are supported to generate the pixmap.
-  * GNU Barcode
-  * pdf417_enc
-  * TBarcode (http://www.tec-it.com)
-  *
-  * This tools generate a postscript file. The ps file is
-  * transformed to a PBM file scaled to the requested resolution
-  * or screen resolution using ghostscript.
-  *
-  * The generated barcodes are cached using BarcodeCache.
-  * To fill a barcodeData struct with data from the user, you
-  * might want to use BarcodeWidget.
-  *
-  * A small example, of how to generate a valid Barcode in your application
-  * without the use of BarcodeWidget:
-  * <pre>
-  *  barcodeData data;
-  *  BarCode::fillDefault( &data ); // setup a barcode object with valid data
-  *  data.value = "KBARCODE";
-  *  data.type = "code39";
-  *  BarCode b( &data ); // create a barcode object
-  *  TQPixmap p = b.pixmap(); // get a pixmap of the barcode
-  * </pre>
-  *
-  * @see BarcodeCache @see BarcodeWidget
-  * @author Dominik Seichter  
-  */
-class BarCode {
-    public:
-        /** Create a BarCode object from the data const barcodeData* @p data.
-          * You may delete @p data afterwards. Be sure to call at least once
-          * BarCode::fillDefault() on @p data. Otherwise you rsik invalid barcode data.
-          */
-        BarCode( const barcodeData* data );
-        /** Create a BarCode object filled with default data.
-          */
-        BarCode();
-        ~BarCode();
-
-        /** Get a TQPixmap of the current barcodeData in
-          * screen resolution-
-          */
-        const TQPixmap pixmap();
-        /** Get a TQPixmap of the barcode in the same resolution as the
-          * TQPaintDevice* @p device. This is necessary if you want to print
-          * your barcodes, as they won't be scanable in screen resolution.
-          */
-        const TQPixmap printerPixmap( TQPaintDevice* device );
-
-        /** Set the index of the barcodes for barcode sequences.
-          */
-        void setIndex( int i ) { m_index = i; }
-        /** Change the barcodeData to @p d, call redraw() afterwards.
-          */        
-        void setData( barcodeData* d ) { barcode = *d; }
-        bool validBarcode() {return !p.isNull();}
-
-        barcodeData data() const { return barcode; }
-
-        TQString sequenceValue();
-
-        /** Fill @p barcodeData* data with its default parameters.
-          * Always call this function, after you have created a new
-          * barcodeData struct.
-          */
-        static void fillDefault( barcodeData* data );
-
-        /** Test if the encodingType @p type has a certain 
-          * @p feature, as defined in the codes TQValueList.
-          */
-        static bool hasFeature( const TQString & type, unsigned int feature );
-
-        /** get the meximum length of value for the encoding type @p name
-          * from the SQL databases.
-          */
-        static const TQString getMaxLength( const TQString & name );
-
-        /** This function has to be called befor barcode support is avaible.
-          * It searches for the barcode generation backends
-          * (gnu barcode, tbarcode and pdf417) and fills the TQValueList codes
-          * with data and information about the avaible barcode encoding types.
-          * You only have to call this function once.
-          * The results can be retrieved with the following functions:
-          * @see haveBarcode()
-          * @see haveTBarcode()
-          * @see havePDFBarcode()
-          */
-        static void setHaveBarcode();
-        static bool haveBarcode() {
-            return ( m_haveGnuBarcode || m_havePdfEncode || m_haveTBarcode );
-        }
-        static bool haveGNUBarcode() {
-            return m_haveGnuBarcode;
-        }
-        static bool haveTBarcode() {
-            return m_haveTBarcode;
-        }
-        static bool havePDFBarcode() {
-            return m_havePdfEncode;
-        }
-
-        /** call this, always after you changed the barcodeData using setData,
-          * so that the pixmaps are recreated.
-          */
-        void redrawBarcode();
-    private:
-        bool createPixmap( TQPixmap* target, int resx, int resy );
-        void createBarcode( TQPixmap* target, TQPaintDevice* device );
-        bool createPdf417( KTempFile* output );
-        bool createTBarcode( KTempFile* output );
-        TQString createSequence( const TQString & value );
-        /** reads the bounding box information from a postscript file
-          */
-        TQSize getBoundingBox( const TQString & filename );
-        
-        void cleanUp( KTempFile* file, KTempFile* file2, TQPixmap* target );
-        static barcodeFormat fillStruct( const TQString & name, const TQString & text, const int feature );
-
-        /**
-          * Cut the barcode either on the top or
-          * on the bottom, depending on the text position.
-          *
-          * @param pic the TQPixmap that will be cutted
-          * @param cut a value between 0.0 and 1.0. If cut = 1.0
-          *        then no cut will happen, if cut = 0.5, half of
-          *        the barcode is going to be cutted away.
-          */
-        TQPixmap cut( TQPixmap* pic, double cut );
-        
-        /**
-          * Add a margin to the TQPixmap pic.
-          * @param pic the TQPixmap pic which should get a margin
-          * @param margin the margin size in pixels.
-          */
-        TQPixmap addMargin( TQPixmap* pic, int margin );
-
-
-        /**
-          * The barcode is generated from this value.
-          * This is necessary so that sequences will work.
-          */
-        TQString m_value;
-
-        /** index for barcode sequences;
-          */
-        int m_index;
-                
-        TQPixmap p;
-        TQPixmap pp;
-        barcodeData barcode;
-        static bool m_haveGnuBarcode;
-        static bool m_havePdfEncode;
-        static bool m_haveTBarcode;
-};
-
-#endif
diff --git a/kbarcode/referencecounted.cpp b/kbarcode/referencecounted.cpp
deleted file mode 100644
index 8759ffc..0000000
--- a/kbarcode/referencecounted.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/***************************************************************************
-                         referencecounted.cpp  -  description
-                             -------------------
-    begin                : Mo Apr 18 2005
-    copyright            : (C) 2005 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
-                                                                          
-    This program is free software; you can redistribute it and/or modify  
-    it under the terms of the GNU General Public License as published by  
-    the Free Software Foundation; either version 2 of the License, or     
-    (at your option) any later version.                                   
-                                                                          
- ***************************************************************************/
-
-#include "referencecounted.h"
-
-
-
-
diff --git a/kbarcode/semantic.cache b/kbarcode/semantic.cache
deleted file mode 100644
index 3f72018..0000000
--- a/kbarcode/semantic.cache
+++ /dev/null
@@ -1,39 +0,0 @@
-;; Object kbarcode/
-;; SEMANTICDB Tags save file
-(semanticdb-project-database-file "kbarcode/"
-  :tables (list 
-   (semanticdb-table "barkode.cpp"
-    :major-mode 'c++-mode
-    :tags '(("barkode.h" include nil nil [830 850]) ("barkodeengine.h" include nil nil [851 877]) ("gnubarcode.h" include nil nil [878 901]) ("pixmapbarcode.h" include nil nil [902 928]) ("purepostscript.h" include nil nil [929 956]) ("tbarcode2.h" include nil nil [957 979]) ("tokenprovider.h" include nil nil [980 1006]) ("barcode.h" include (:system-flag t) nil [1042 1064]) ("BARCODE_DEFAULT_FLAGS" variable (:constant-flag t :default-value (nil)) nil [1071 1111]) ("BARCODE_ENCODING_MASK" variable (:constant-flag t :default-value (nil)) nil [1113 1153]) ("BARCODE_NO_ASCII" variable (:constant-flag t :default-value (nil)) nil [1182 1222]) ("BARCODE_NO_CHECKSUM" variable (:constant-flag t :default-value (nil)) nil [1252 1292]) ("BARCODE_OUTPUT_MASK" variable (:constant-flag t :default-value (nil)) nil [1327 1367]) ("BARCODE_OUT_EPS" variable (:constant-flag t :default-value (nil)) nil [1393 1433]) ("BARCODE_OUT_PS" variable (:constant-flag t :default-value (nil)) nil [1434 1474]) ("BARCODE_OUT_PCL" variable (:constant-flag t :default-value (nil)) nil [1475 1515]) ("BARCODE_OUT_PCL_III" variable (:constant-flag t :default-value (nil)) nil [1588 1628]) ("BARCODE_OUT_NOHEADERS" variable (:constant-flag t :default-value (nil)) nil [1629 1669]) ("" type (:members (("BARCODE_ANY" variable (:constant-flag t :default-value (1767 1768) :type "int") (reparse-symbol enumsubparts) [1753 1768]) ("BARCODE_EAN" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1800 1812]) ("BARCODE_UPC" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1817 1829]) ("BARCODE_ISBN" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1867 1880]) ("BARCODE_39" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1924 1935]) ("BARCODE_128" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1962 1974]) ("BARCODE_128C" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2024 2037]) ("BARCODE_128B" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2089 2102]) ("BARCODE_I25" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2150 2162]) ("BARCODE_128RAW" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2213 2228]) ("BARCODE_CBR" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2280 2292]) ("BARCODE_MSI" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2342 2354]) ("BARCODE_PLS" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2400 2412]) ("BARCODE_93" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [2462 2519])) :type "enum") nil [1742 2520]) ("qdom.h" include (:system-flag t) nil [2559 2576]) ("qfile.h" include (:system-flag t) nil [2577 2595]) ("qpainter.h" include (:system-flag t) nil [2596 2617]) ("qpicture.h" include (:system-flag t) nil [2618 2639]) ("qpixmap.h" include (:system-flag t) nil [2640 2660]) ("qsize.h" include (:system-flag t) nil [2661 2679]) ("tdelocale.h" include (:system-flag t) nil [2681 2701]) ("kstandarddirs.h" include (:system-flag t) nil [2702 2728]) ("Barkode::s_info" variable (:type ("QValueList" type (:type "class") nil nil)) nil [2730 2771]) ("Barkode::s_encoding" variable (:pointer 1 :default-value "NULL;" :type ("QStringList" type (:type "class") nil nil)) nil [2772 2814]) ("Barkode::s_haveGnuBarcode" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [2815 2858]) ("Barkode::s_havePdfEncode" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [2859 2902]) ("Barkode::s_haveTBarcode" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [2903 2946]) ("Barkode::s_haveTBarcode2" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [2947 2990]) ("Barkode::s_havePurePostscript" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [2991 3034]) ("Barkode" function (:constructor-flag t :parent "Barkode" :type ("Barkode" type "class")) nil [3036 3136]) ("Barkode" function (:constructor-flag t :parent "Barkode" :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3156 3181])) :type ("Barkode" type "class")) nil [3138 3268]) ("Barkode" function (:destructor-flag t :parent "Barkode" :type "void") nil [3270 3337]) ("setTokenProvider" function (:parent "Barkode" :arguments (("token" variable (:pointer 1 :type ("TokenProvider" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3371 3393])) :type "void") nil [3339 3418]) ("defaults" function (:parent "Barkode" :type "void") nil [3420 4097]) ("setData" function (:parent "Barkode" :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4122 4147])) :type "void") nil [4099 5122]) ("==" function (:parent "Barkode" :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5230 5255])) :type ("bool" type (:type "class") nil nil)) nil [5204 5723]) ("picture" function (:parent "Barkode" :constant-flag t :type ("QPicture" type (:type "class") nil nil)) nil [5725 5973]) ("drawInvalid" function (:parent "Barkode" :arguments (("painter" variable (:type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6002 6021]) ("x" variable (:type "int") (reparse-symbol arg-sub-list) [6022 6028]) ("y" variable (:type "int") (reparse-symbol arg-sub-list) [6029 6036])) :type "void") nil [5975 6395]) ("size" function (:parent "Barkode" :constant-flag t :type ("QSize" type (:type "class") nil nil)) nil [6397 6490]) ("pixmap" function (:parent "Barkode" :constant-flag t :arguments (("scalex" variable (:type "double") (reparse-symbol arg-sub-list) [6523 6537]) ("scaley" variable (:type "double") (reparse-symbol arg-sub-list) [6538 6553])) :type ("QPixmap" type (:type "class") nil nil)) nil [6492 6898]) ("parsedValue" function (:parent "Barkode" :constant-flag t :type ("QString" type (:type "class") nil nil)) nil [6900 8603]) ("engineForType" function (:parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [8637 8659])) :type ("EEngine" type (:type "class") nil nil)) nil [8605 8877]) ("updateEngine" function (:parent "Barkode" :type "void") nil [8879 9790]) ("drawBarcode" function (:parent "Barkode" :arguments (("painter" variable (:type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [9820 9839]) ("x" variable (:type "int") (reparse-symbol arg-sub-list) [9840 9846]) ("y" variable (:type "int") (reparse-symbol arg-sub-list) [9847 9854])) :type "void") nil [9792 9927]) ("update" function (:parent "Barkode" :arguments (("device" variable (:pointer 1 :constant-flag t :type ("QPaintDevice" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [9951 9979])) :type "void") nil [9929 10038]) ("isValid" function (:parent "Barkode" :type ("bool" type (:type "class") nil nil)) nil [10224 10277]) ("background" function (:parent "Barkode" :constant-flag t :type ("QColor" type (:type "class") nil nil)) nil [10279 10350]) ("foreground" function (:parent "Barkode" :constant-flag t :type ("QColor" type (:type "class") nil nil)) nil [10352 10423]) ("textColor" function (:parent "Barkode" :constant-flag t :type ("QColor" type (:type "class") nil nil)) nil [10425 10494]) ("fontsize" function (:parent "Barkode" :constant-flag t :type "unsigned int") nil [10496 10567]) ("quietZone" function (:parent "Barkode" :constant-flag t :type "unsigned int") nil [10569 10642]) ("barHeight" function (:parent "Barkode" :constant-flag t :type "unsigned int") nil [10644 10718]) ("type" function (:parent "Barkode" :constant-flag t :type ("QString" type (:type "class") nil nil)) nil [10720 10780]) ("value" function (:parent "Barkode" :constant-flag t :type ("QString" type (:type "class") nil nil)) nil [10782 10844]) ("index" function (:parent "Barkode" :constant-flag t :type "unsigned int") nil [10846 10911]) ("sequenceEnabled" function (:parent "Barkode" :constant-flag t :type ("bool" type (:type "class") nil nil)) nil [10913 10983]) ("sequenceMode" function (:parent "Barkode" :constant-flag t :type ("ESequence" type (:type "class") nil nil)) nil [10985 11058]) ("sequenceStart" function (:parent "Barkode" :constant-flag t :type "int") nil [11060 11133]) ("sequenceStep" function (:parent "Barkode" :constant-flag t :type "int") nil [11135 11206]) ("databaseMode" function (:parent "Barkode" :constant-flag t :type ("QString" type (:type "class") nil nil)) nil [11208 11285]) ("textVisible" function (:parent "Barkode" :constant-flag t :type ("bool" type (:type "class") nil nil)) nil [11287 11357]) ("rotation" function (:parent "Barkode" :constant-flag t :type "int") nil [11359 11421]) ("scaling" function (:parent "Barkode" :constant-flag t :type "double") nil [11423 11486]) ("cut" function (:parent "Barkode" :constant-flag t :type "double") nil [11488 11543]) ("datamatrixSize" function (:parent "Barkode" :constant-flag t :type "int") nil [11545 11620]) ("setBackground" function (:parent "Barkode" :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11835 11853])) :type "void") nil [11806 11879]) ("setForeground" function (:parent "Barkode" :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11910 11928])) :type "void") nil [11881 11954]) ("setTextColor" function (:parent "Barkode" :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11984 12002])) :type "void") nil [11956 12027]) ("setFontsize" function (:parent "Barkode" :arguments (("f" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [12056 12072])) :type "void") nil [12029 12096]) ("setQuietZone" function (:parent "Barkode" :arguments (("q" variable (:constant-flag t :type "unsigned int") (reparse-symbol arg-sub-list) [12126 12148])) :type "void") nil [12098 12173]) ("setBarHeight" function (:parent "Barkode" :arguments (("h" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [12203 12219])) :type "void") nil [12175 12245]) ("setType" function (:parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12270 12292])) :type "void") nil [12247 12343]) ("setValue" function (:parent "Barkode" :arguments (("value" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12369 12392])) :type "void") nil [12345 12417]) ("setIndex" function (:parent "Barkode" :arguments (("i" variable (:constant-flag t :type "unsigned int") (reparse-symbol arg-sub-list) [12443 12465])) :type "void") nil [12419 12486]) ("setSequenceEnabled" function (:parent "Barkode" :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12522 12530])) :type "void") nil [12488 12554]) ("setSequenceMode" function (:parent "Barkode" :arguments (("e" variable (:type ("ESequence" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12587 12600])) :type "void") nil [12556 12625]) ("setSequenceStart" function (:parent "Barkode" :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [12659 12666])) :type "void") nil [12627 12696]) ("setSequenceStep" function (:parent "Barkode" :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [12729 12736])) :type "void") nil [12698 12765]) ("setDatabaseMode" function (:parent "Barkode" :arguments (("mode" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12798 12820])) :type "void") nil [12767 12852]) ("setTextVisible" function (:parent "Barkode" :arguments (("b" variable (:constant-flag t :type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [12884 12898])) :type "void") nil [12854 12926]) ("setRotation" function (:parent "Barkode" :arguments (("r" variable (:constant-flag t :type "int") (reparse-symbol arg-sub-list) [12955 12968])) :type "void") nil [12928 12992]) ("setScaling" function (:parent "Barkode" :arguments (("d" variable (:constant-flag t :type "double") (reparse-symbol arg-sub-list) [13020 13036])) :type "void") nil [12994 13059]) ("setCut" function (:parent "Barkode" :arguments (("c" variable (:constant-flag t :type "double") (reparse-symbol arg-sub-list) [13083 13099])) :type "void") nil [13061 13118]) ("setDatamatrixSize" function (:parent "Barkode" :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [13153 13160])) :type "void") nil [13120 13191]) ("hasFeature" function (:parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13371 13392]) ("feature" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [13393 13415])) :type ("bool" type (:type "class") nil nil)) nil [13345 13603]) ("internalType" function (:parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13632 13654])) :type "int") nil [13605 13819]) ("encodingTypes" function (:pointer 1 :parent "Barkode" :constant-flag t :type ("QStringList" type (:type "class") nil nil)) nil [13821 14107]) ("typeFromName" function (:pointer 1 :parent "Barkode" :constant-flag t :arguments (("name" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [14144 14166])) :type "char") nil [14109 14326]) ("nameFromType" function (:pointer 1 :parent "Barkode" :constant-flag t :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [14363 14385])) :type "char") nil [14328 14545]) ("validatorFromType" function (:pointer 1 :parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [14584 14606])) :type ("QString" type (:type "class") nil nil)) nil [14547 14762]) ("validatorNotFromType" function (:pointer 1 :parent "Barkode" :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [14804 14826])) :type ("QString" type (:type "class") nil nil)) nil [14764 14985]) ("createInfo" function (:parent "Barkode" :arguments (("xml" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [15021 15037]) ("name" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [15038 15059]) ("engine" variable (:constant-flag t :type ("EEngine" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [15060 15081]) ("features" variable (:constant-flag t :type "unsigned int") (reparse-symbol arg-sub-list) [15115 15143]) ("internal" variable (:constant-flag t :type "int") (reparse-symbol arg-sub-list) [15144 15164])) :type ("tBarcodeInfo" type (:type "class") nil nil)) nil [14987 16059]) ("initInfo" function (:parent "Barkode" :type "void") nil [16061 35789]) ("initValidators" function (:parent "Barkode" :type "void") nil [35791 37608]))
-    :file "barkode.cpp"
-    :pointmax 37610
-    )
-   (semanticdb-table "purepostscript.cpp"
-    :major-mode 'c++-mode
-    :tags '(("purepostscript.h" include nil nil [1029 1056]) ("barkode.h" include nil nil [1057 1077]) ("stdlib.h" include (:system-flag t) nil [1079 1098]) ("qdom.h" include (:system-flag t) nil [1100 1117]) ("qfile.h" include (:system-flag t) nil [1118 1136]) ("qtextstream.h" include (:system-flag t) nil [1137 1161]) ("kstandarddirs.h" include (:system-flag t) nil [1163 1189]) ("tdetempfile.h" include (:system-flag t) nil [1190 1212]) ("MAX_LINE_LENGTH" variable (:constant-flag t :default-value (nil)) nil [1214 1241]) ("BEGIN_TEMPLATE" variable (:constant-flag t :default-value (nil)) nil [1242 1285]) ("END_TEMPLATE" variable (:constant-flag t :default-value (nil)) nil [1286 1325]) ("PurePostscriptBarcode::s_path" variable (:default-value "QString::null;" :type ("QString" type (:type "class") nil nil)) nil [1327 1381]) ("PurePostscriptOptions" function (:constructor-flag t :parent "PurePostscriptOptions" :type ("PurePostscriptOptions" type "class")) nil [1383 1478]) ("defaults" function (:parent "PurePostscriptOptions" :type "void") nil [1718 1781]) ("load" function (:parent "PurePostscriptOptions" :arguments (("tag" variable (:pointer 1 :constant-flag t :type ("QDomElement" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1817 1841])) :type "void") nil [1783 1910]) ("save" function (:parent "PurePostscriptOptions" :arguments (("tag" variable (:pointer 1 :type ("QDomElement" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1946 1964])) :type "void") nil [1912 2021]) ("PurePostscriptBarcode" function (:constructor-flag t :parent "PurePostscriptBarcode" :type ("PurePostscriptBarcode" type "class")) nil [2023 2746]) ("PurePostscriptBarcode" function (:destructor-flag t :parent "PurePostscriptBarcode" :type "void") nil [2748 2799]) ("init" function (:parent "PurePostscriptBarcode" :type "void") nil [2801 3235]) ("START_TOKEN" variable (:constant-flag t :default-value (nil)) nil [3237 3263]) ("BEGIN_ENCODER" variable (:constant-flag t :default-value (nil)) nil [3264 3302]) ("DESCRIPTION" variable (:constant-flag t :default-value (nil)) nil [3303 3331]) ("EXAMPLE" variable (:constant-flag t :default-value (nil)) nil [3332 3356]) ("initInfo" function (:parent "PurePostscriptBarcode" :arguments (("info" variable (:pointer 1 :type ("TBarcodeInfoList" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3396 3420])) :type "void") nil [3358 5039]) ("hasPurePostscriptBarcode" function (:parent "PurePostscriptBarcode" :type ("bool" type (:type "class") nil nil)) nil [5041 5128]) ("createProgram" function (:parent "PurePostscriptBarcode" :arguments (("prg" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5173 5188])) :type "void") nil [5130 6215]) ("bbox" function (:parent "PurePostscriptBarcode" :arguments (("postscript" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [6252 6275]) ("postscript_size" variable (:type "long") (reparse-symbol arg-sub-list) [6276 6298])) :type ("QRect" type (:type "class") nil nil)) nil [6217 6895]) ("createPostscript" function (:parent "PurePostscriptBarcode" :arguments (("postscript" variable (:pointer 2 :type "char") (reparse-symbol arg-sub-list) [6943 6961]) ("postscript_size" variable (:pointer 1 :type "long") (reparse-symbol arg-sub-list) [6962 6985])) :type ("bool" type (:type "class") nil nil)) nil [6897 7316]))
-    :file "purepostscript.cpp"
-    :pointmax 7317
-    )
-   (semanticdb-table "barkode.h"
-    :major-mode 'c-mode
-    :tags '(("BARKODE_H" variable (:constant-flag t) nil [889 910]) ("qcolor.h" include (:system-flag t) nil [909 928]) ("qstring.h" include (:system-flag t) nil [929 949]) ("barkodeengine.h" include nil nil [951 977]) ("ESequence" type (:typedef (nil type (:members (("NUM" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1045 1049]) ("ALPHA" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1050 1056]) ("ALPHANUM" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1057 1067])) :type "enum") nil nil) :type "typedef") nil [1030 1078]) ("" type (:members (("NOCUT" variable (:constant-flag t :default-value (1193 1200) :type "int") (reparse-symbol enumsubparts) [1185 1200]) ("MULTILINE" variable (:constant-flag t :default-value (1214 1221) :type "int") (reparse-symbol enumsubparts) [1202 1221]) ("NOTEXT" variable (:constant-flag t :default-value (1232 1239) :type "int") (reparse-symbol enumsubparts) [1223 1239]) ("NOSCALE" variable (:constant-flag t :default-value (1251 1258) :type "int") (reparse-symbol enumsubparts) [1241 1258]) ("PDF417BARCODE" variable (:constant-flag t :default-value (1350 1357) :type "int") (reparse-symbol enumsubparts) [1334 1357]) ("TBARCODEADV" variable (:constant-flag t :default-value (1373 1380) :type "int") (reparse-symbol enumsubparts) [1359 1380]) ("PUREADV" variable (:constant-flag t :default-value (1392 1399) :type "int") (reparse-symbol enumsubparts) [1382 1399]) ("DATAMATRIX" variable (:constant-flag t :default-value (1414 1421) :type "int") (reparse-symbol enumsubparts) [1401 1421]) ("COLORED" variable (:constant-flag t :default-value (1441 1448) :type "int") (reparse-symbol enumsubparts) [1431 1448]) ("POSTNETCHECK" variable (:constant-flag t :default-value (1521 1528) :type "int") (reparse-symbol enumsubparts) [1506 1528]) ("CODE128CHECK" variable (:constant-flag t :default-value (1545 1552) :type "int") (reparse-symbol enumsubparts) [1530 1552]) ("EAN8CHECK" variable (:constant-flag t :default-value (1566 1573) :type "int") (reparse-symbol enumsubparts) [1554 1573]) ("EAN13CHECK" variable (:constant-flag t :default-value (1588 1595) :type "int") (reparse-symbol enumsubparts) [1575 1595]) ("UPCACHECK" variable (:constant-flag t :default-value (1616 1623) :type "int") (reparse-symbol enumsubparts) [1604 1623]) ("UPCECHECK" variable (:constant-flag t :default-value (1637 1644) :type "int") (reparse-symbol enumsubparts) [1625 1644]) ("MODULOALLCHECK" variable (:constant-flag t :default-value (1663 1670) :type "int") (reparse-symbol enumsubparts) [1646 1670]) ("MODULO10CHECK" variable (:constant-flag t :default-value (1688 1695) :type "int") (reparse-symbol enumsubparts) [1672 1695]) ("BARCODE2D" variable (:constant-flag t :default-value (1764 1771) :type "int") (reparse-symbol enumsubparts) [1751 1771]) ("MULTILINE" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1772 1783]) ("NOTEXT" variable (:constant-flag t :type "int") (reparse-symbol enumsubparts) [1784 1792])) :type "enum") nil [1178 1793]) ("tBarcodeInfo" type (:members (("xml" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2053 2065]) ("name" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2125 2138]) ("engine" variable (:type ("EEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2186 2201]) ("features" variable (:type "unsigned int") (reparse-symbol classsubparts) [2270 2292]) ("internal" variable (:type "int") (reparse-symbol classsubparts) [2363 2376]) ("validator" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2468 2486]) ("validatorNot" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2491 2512])) :type "struct") nil [1888 2515]) ("TBarcodeInfoList" type (:typedef ("QValueList" type (:type "class") nil nil) :superclasses "QValueList" :type "typedef") nil [2517 2567]) ("BarkodeEngine" type (:type "class") nil [2569 2589]) ("QPainter" type (:type "class") nil [2590 2605]) ("QPicture" type (:type "class") nil [2606 2621]) ("QSize" type (:type "class") nil [2622 2634]) ("QPaintDevice" type (:type "class") nil [2635 2654]) ("TokenProvider" type (:type "class") nil [2655 2675]) ("Barkode" type (:members (("public" label nil (reparse-symbol classsubparts) [2694 2701]) ("Barkode" function (:prototype-flag t :constructor-flag t :type ("Barkode" type "class")) (reparse-symbol classsubparts) [2706 2716]) ("Barkode" function (:prototype-flag t :constructor-flag t :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2730 2755])) :type ("Barkode" type "class")) (reparse-symbol classsubparts) [2721 2756]) ("Barkode" function (:prototype-flag t :destructor-flag t :typemodifiers ("virtual") :type "void") (reparse-symbol classsubparts) [2761 2780]) ("setTokenProvider" function (:prototype-flag t :arguments (("token" variable (:pointer 1 :type ("TokenProvider" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2869 2891])) :type "void") (reparse-symbol classsubparts) [2846 2892]) ("defaults" function (:prototype-flag t :type "void") (reparse-symbol classsubparts) [2939 2955]) ("update" function (:prototype-flag t :arguments (("device" variable (:pointer 1 :constant-flag t :type ("QPaintDevice" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3079 3107])) :type "void") (reparse-symbol classsubparts) [3066 3108]) ("parsedValue" function (:prototype-flag t :constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3217 3245]) ("pixmap" function (:prototype-flag t :constant-flag t :arguments (("scalex" variable (:default-value "1.0" :type "double") (reparse-symbol arg-sub-list) [3274 3293]) ("scaley" variable (:default-value "1.0" :type "double") (reparse-symbol arg-sub-list) [3295 3314])) :type ("QPixmap" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3252 3317]) ("picture" function (:prototype-flag t :constant-flag t :type ("QPicture" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3322 3347]) ("size" function (:prototype-flag t :constant-flag t :type ("QSize" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3352 3377]) ("isValid" function (:prototype-flag t :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3382 3403]) ("background" function (:prototype-flag t :constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3409 3443]) ("foreground" function (:prototype-flag t :constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3448 3482]) ("textColor" function (:prototype-flag t :constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3487 3520]) ("fontsize" function (:prototype-flag t :constant-flag t :type "unsigned int") (reparse-symbol classsubparts) [3525 3561]) ("quietZone" function (:prototype-flag t :constant-flag t :type "unsigned int") (reparse-symbol classsubparts) [3566 3603]) ("barHeight" function (:prototype-flag t :constant-flag t :type "unsigned int") (reparse-symbol classsubparts) [3608 3645]) ("type" function (:prototype-flag t :constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3650 3679]) ("value" function (:prototype-flag t :constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3684 3714]) ("sequenceEnabled" function (:prototype-flag t :constant-flag t :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3719 3754]) ("sequenceMode" function (:prototype-flag t :constant-flag t :type ("ESequence" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3759 3796]) ("sequenceStart" function (:prototype-flag t :constant-flag t :type "int") (reparse-symbol classsubparts) [3801 3833]) ("sequenceStep" function (:prototype-flag t :constant-flag t :type "int") (reparse-symbol classsubparts) [3838 3869]) ("databaseMode" function (:prototype-flag t :constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3874 3911]) ("textVisible" function (:prototype-flag t :constant-flag t :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [3916 3947]) ("rotation" function (:prototype-flag t :constant-flag t :type "int") (reparse-symbol classsubparts) [3952 3979]) ("scaling" function (:prototype-flag t :constant-flag t :type "double") (reparse-symbol classsubparts) [3984 4013]) ("index" function (:prototype-flag t :constant-flag t :type "unsigned int") (reparse-symbol classsubparts) [4018 4051]) ("cut" function (:prototype-flag t :constant-flag t :type "double") (reparse-symbol classsubparts) [4056 4081]) ("datamatrixSize" function (:prototype-flag t :constant-flag t :type "int") (reparse-symbol classsubparts) [4086 4119]) ("setBackground" function (:prototype-flag t :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4149 4167])) :type "void") (reparse-symbol classsubparts) [4129 4168]) ("setForeground" function (:prototype-flag t :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4193 4211])) :type "void") (reparse-symbol classsubparts) [4173 4212]) ("setTextColor" function (:prototype-flag t :arguments (("c" variable (:constant-flag t :type ("QColor" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4236 4254])) :type "void") (reparse-symbol classsubparts) [4217 4255]) ("setFontsize" function (:prototype-flag t :arguments (("f" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [4279 4295])) :type "void") (reparse-symbol classsubparts) [4260 4296]) ("setQuietZone" function (:prototype-flag t :arguments (("q" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [4320 4336])) :type "void") (reparse-symbol classsubparts) [4301 4337]) ("setBarHeight" function (:prototype-flag t :arguments (("h" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [4361 4377])) :type "void") (reparse-symbol classsubparts) [4342 4378]) ("setType" function (:prototype-flag t :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4397 4419])) :type "void") (reparse-symbol classsubparts) [4383 4420]) ("setValue" function (:prototype-flag t :arguments (("value" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4440 4463])) :type "void") (reparse-symbol classsubparts) [4425 4464]) ("setTextVisible" function (:prototype-flag t :arguments (("b" variable (:constant-flag t :type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4490 4504])) :type "void") (reparse-symbol classsubparts) [4469 4505]) ("setIndex" function (:prototype-flag t :arguments (("i" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [4595 4611])) :type "void") (reparse-symbol classsubparts) [4580 4612]) ("setSequenceEnabled" function (:prototype-flag t :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4642 4650])) :type "void") (reparse-symbol classsubparts) [4617 4651]) ("setSequenceMode" function (:prototype-flag t :arguments (("e" variable (:type ("ESequence" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4678 4691])) :type "void") (reparse-symbol classsubparts) [4656 4692]) ("setSequenceStart" function (:prototype-flag t :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [4720 4727])) :type "void") (reparse-symbol classsubparts) [4697 4728]) ("setSequenceStep" function (:prototype-flag t :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [4755 4762])) :type "void") (reparse-symbol classsubparts) [4733 4763]) ("setDatabaseMode" function (:prototype-flag t :arguments (("mode" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4790 4812])) :type "void") (reparse-symbol classsubparts) [4768 4813]) ("setRotation" function (:prototype-flag t :arguments (("r" variable (:constant-flag t :type "int") (reparse-symbol arg-sub-list) [4836 4849])) :type "void") (reparse-symbol classsubparts) [4818 4850]) ("setScaling" function (:prototype-flag t :arguments (("d" variable (:constant-flag t :type "double") (reparse-symbol arg-sub-list) [4872 4888])) :type "void") (reparse-symbol classsubparts) [4855 4889]) ("setCut" function (:prototype-flag t :arguments (("c" variable (:constant-flag t :type "double") (reparse-symbol arg-sub-list) [4907 4923])) :type "void") (reparse-symbol classsubparts) [4894 4924]) ("setDatamatrixSize" function (:prototype-flag t :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [4953 4960])) :type "void") (reparse-symbol classsubparts) [4929 4961]) ("setData" function (:prototype-flag t :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5067 5092])) :type "void") (reparse-symbol classsubparts) [5053 5093]) ("==" function (:prototype-flag t :arguments (("barkode" variable (:constant-flag t :type ("Barkode" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5162 5187])) :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [5145 5194]) ("engine" function (:prototype-flag t :pointer 1 :typemodifiers ("inline") :type ("BarkodeEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [5200 5231]) ("engine" function (:prototype-flag t :pointer 1 :typemodifiers ("inline") :constant-flag t :type ("BarkodeEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [5236 5279]) ("hasFeature" function (:prototype-flag t :typemodifiers ("static") :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5430 5451]) ("feature" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [5452 5474])) :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [5406 5475]) ("internalType" function (:prototype-flag t :typemodifiers ("static") :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5582 5604])) :type "int") (reparse-symbol classsubparts) [5557 5605]) ("encodingTypes" function (:prototype-flag t :pointer 1 :typemodifiers ("static") :constant-flag t :type ("QStringList" type (:type "class") nil nil)) (reparse-symbol classsubparts) [5710 5752]) ("typeFromName" function (:prototype-flag t :pointer 1 :typemodifiers ("static") :constant-flag t :arguments (("name" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5888 5910])) :type "char") (reparse-symbol classsubparts) [5855 5911]) ("nameFromType" function (:prototype-flag t :pointer 1 :typemodifiers ("static") :constant-flag t :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6049 6071])) :type "char") (reparse-symbol classsubparts) [6016 6072]) ("validatorFromType" function (:prototype-flag t :pointer 1 :typemodifiers ("static") :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6113 6135])) :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6078 6136]) ("validatorNotFromType" function (:prototype-flag t :pointer 1 :typemodifiers ("static") :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6179 6201])) :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6141 6202]) ("engineForType" function (:prototype-flag t :typemodifiers ("static") :arguments (("type" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6313 6335])) :type ("EEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6283 6336]) ("drawInvalid" function (:prototype-flag t :arguments (("painter" variable (:type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6432 6451]) ("x" variable (:default-value "0" :type "int") (reparse-symbol arg-sub-list) [6452 6461]) ("y" variable (:default-value "0" :type "int") (reparse-symbol arg-sub-list) [6463 6472])) :type "void") (reparse-symbol classsubparts) [6414 6475]) ("haveBarcode" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6561 6721]) ("haveGNUBarcode" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6726 6824]) ("haveTBarcode" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6829 6923]) ("haveTBarcode2" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [6928 7024]) ("havePDFBarcode" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7029 7126]) ("havePurePostscriptBarcode" function (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7131 7244]) ("createInfo" function (:prototype-flag t :typemodifiers ("static") :arguments (("xml" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [7282 7298]) ("name" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [7299 7320]) ("engine" variable (:constant-flag t :type ("EEngine" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [7321 7342]) ("features" variable (:constant-flag t :default-value "0" :type "unsigned int") (reparse-symbol arg-sub-list) [7380 7411]) ("internal" variable (:constant-flag t :default-value "0" :type "int") (reparse-symbol arg-sub-list) [7413 7435])) :type ("tBarcodeInfo" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7250 7438]) ("protected" label nil (reparse-symbol classsubparts) [7441 7451]) ("drawBarcode" function (:prototype-flag t :arguments (("painter" variable (:type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [7475 7494]) ("x" variable (:default-value "0" :type "int") (reparse-symbol arg-sub-list) [7495 7504]) ("y" variable (:default-value "0" :type "int") (reparse-symbol arg-sub-list) [7506 7515])) :type "void") (reparse-symbol classsubparts) [7456 7518]) ("private" label nil (reparse-symbol classsubparts) [7521 7529]) ("initInfo" function (:prototype-flag t :typemodifiers ("static") :type "void") (reparse-symbol classsubparts) [7534 7557]) ("initValidators" function (:prototype-flag t :typemodifiers ("static") :type "void") (reparse-symbol classsubparts) [7562 7591]) ("updateEngine" function (:prototype-flag t :type "void") (reparse-symbol classsubparts) [7597 7617]) ("protected" label nil (reparse-symbol classsubparts) [7620 7630]) ("m_engine" variable (:pointer 1 :type ("BarkodeEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7635 7659]) ("m_token" variable (:pointer 1 :type ("TokenProvider" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7664 7687]) ("m_valid" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7693 7706]) ("m_sequence" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7711 7727]) ("m_esequence" variable (:type ("ESequence" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7732 7754]) ("m_sequence_start" variable (:type "int") (reparse-symbol classsubparts) [7759 7780]) ("m_sequence_step" variable (:type "int") (reparse-symbol classsubparts) [7785 7805]) ("m_text_visible" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7810 7830]) ("m_background" variable (:type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7840 7860]) ("m_foreground" variable (:type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7865 7885]) ("m_textcolor" variable (:type ("QColor" type (:type "class") nil nil)) (reparse-symbol classsubparts) [7890 7909]) ("m_quietzone" variable (:type "unsigned int") (reparse-symbol classsubparts) [7915 7940]) ("m_bar_height" variable (:type "unsigned int") (reparse-symbol classsubparts) [7945 7971]) ("m_fontsize" variable (:type "unsigned int") (reparse-symbol classsubparts) [7976 8000]) ("m_index" variable (:type "unsigned int") (reparse-symbol classsubparts) [8005 8026]) ("m_datamatrix_size" variable (:type "int") (reparse-symbol classsubparts) [8031 8053]) ("m_rotation" variable (:type "int") (reparse-symbol classsubparts) [8058 8073]) ("m_scaling" variable (:type "double") (reparse-symbol classsubparts) [8083 8100]) ("m_cut" variable (:type "double") (reparse-symbol classsubparts) [8105 8118]) ("m_type" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8234 8249]) ("m_value" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8254 8270]) ("m_database_mode" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8275 8299]) ("s_info" variable (:typemodifiers ("static") :type ("TBarcodeInfoList" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8309 8340]) ("s_encoding" variable (:pointer 1 :typemodifiers ("static") :type ("QStringList" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8345 8376]) ("s_haveGnuBarcode" variable (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8382 8411]) ("s_haveTBarcode" variable (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8416 8443]) ("s_haveTBarcode2" variable (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8448 8476]) ("s_havePdfEncode" variable (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8481 8509]) ("s_havePurePostscript" variable (:typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [8514 8547])) :type "class") nil [2677 8550]) ("engine" function (:pointer 1 :parent "Barkode" :type ("BarkodeEngine" type (:type "class") nil nil)) nil [8552 8609]) ("engine" function (:pointer 1 :parent "Barkode" :constant-flag t :type ("BarkodeEngine" type (:type "class") nil nil)) nil [8611 8680]))
-    :file "barkode.h"
-    :pointmax 8704
-    )
-   (semanticdb-table "purepostscript.h"
-    :major-mode 'c-mode
-    :tags '(("PURE_POSTSCRIPT_H" variable (:constant-flag t) nil [1054 1082]) ("pixmapbarcode.h" include nil nil [1081 1107]) ("barkode.h" include nil nil [1108 1128]) ("qcstring.h" include (:system-flag t) nil [1130 1151]) ("PurePostscriptOptions" type (:superclasses ("BarkodeEngineOptions") :members (("public" label nil (reparse-symbol classsubparts) [1217 1224]) ("PurePostscriptOptions" function (:prototype-flag t :constructor-flag t :type ("PurePostscriptOptions" type "class")) (reparse-symbol classsubparts) [1233 1257]) ("defaults" function (:prototype-flag t :type "void") (reparse-symbol classsubparts) [1349 1365]) ("load" function (:prototype-flag t :arguments (("tag" variable (:pointer 1 :constant-flag t :type ("QDomElement" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1386 1410])) :type "void") (reparse-symbol classsubparts) [1375 1411]) ("save" function (:prototype-flag t :arguments (("tag" variable (:pointer 1 :type ("QDomElement" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1431 1449])) :type "void") (reparse-symbol classsubparts) [1420 1450]) ("checksum" function (:typemodifiers ("inline") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [1462 1510]) ("setChecksum" function (:typemodifiers ("inline") :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1544 1552])) :type "void") (reparse-symbol classsubparts) [1519 1569]) ("private" label nil (reparse-symbol classsubparts) [1575 1583]) ("m_check" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [1593 1606])) :type "class") nil [1153 1609]) ("PurePostscriptBarcode" type (:superclasses ("PixmapBarcode") :members (("public" label nil (reparse-symbol classsubparts) [1665 1672]) ("PurePostscriptBarcode" function (:prototype-flag t :constructor-flag t :type ("PurePostscriptBarcode" type "class")) (reparse-symbol classsubparts) [1677 1701]) ("PurePostscriptBarcode" function (:prototype-flag t :destructor-flag t :type "void") (reparse-symbol classsubparts) [1706 1731]) ("init" function (:prototype-flag t :typemodifiers ("static") :type "void") (reparse-symbol classsubparts) [1884 1903]) ("initInfo" function (:prototype-flag t :typemodifiers ("static") :arguments (("info" variable (:pointer 1 :type ("TBarcodeInfoList" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1932 1956])) :type "void") (reparse-symbol classsubparts) [1910 1957]) ("hasPurePostscriptBarcode" function (:prototype-flag t :typemodifiers ("static") :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [1963 2002]) ("engine" function (:prototype-flag t :typemodifiers ("inline") :type ("EEngine" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2008 2038]) ("options" function (:prototype-flag t :pointer 1 :typemodifiers ("inline") :type ("BarkodeEngineOptions" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2044 2083]) ("private" label nil (reparse-symbol classsubparts) [2086 2094]) ("createPostscript" function (:prototype-flag t :typemodifiers ("virtual") :arguments (("postscript" variable (:pointer 2 :type "char") (reparse-symbol arg-sub-list) [2130 2148]) ("postscript_size" variable (:pointer 1 :type "long") (reparse-symbol arg-sub-list) [2149 2172])) :type ("bool" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2099 2173]) ("bbox" function (:prototype-flag t :typemodifiers ("virtual") :arguments (("postscript" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [2198 2221]) ("postscript_size" variable (:type "long") (reparse-symbol arg-sub-list) [2222 2244])) :type ("QRect" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2178 2245]) ("createProgram" function (:prototype-flag t :arguments (("prg" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2449 2464])) :type "void") (reparse-symbol classsubparts) [2429 2465]) ("private" label nil (reparse-symbol classsubparts) [2468 2476]) ("m_options" variable (:type ("PurePostscriptOptions" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2481 2513]) ("m_program" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2519 2537]) ("s_path" variable (:typemodifiers ("static") :type ("QString" type (:type "class") nil nil)) (reparse-symbol classsubparts) [2543 2565])) :type "class") nil [1611 2568]) ("engine" function (:parent "PurePostscriptBarcode" :type ("EEngine" type (:type "class") nil nil)) nil [2570 2647]) ("options" function (:pointer 1 :parent "PurePostscriptBarcode" :type ("BarkodeEngineOptions" type (:type "class") nil nil)) nil [2649 2730]))
-    :file "purepostscript.h"
-    :pointmax 2763
-    )
-   (semanticdb-table "tokenprovider.cpp"
-    :major-mode 'c++-mode
-    :tags '(("tokenprovider.h" include nil nil [1029 1055]) ("sqltables.h" include nil nil [1056 1078]) ("kbarcodesettings.h" include nil nil [1079 1108]) ("barcodeitem.h" include nil nil [1110 1134]) ("textitem.h" include nil nil [1135 1156]) ("textlineitem.h" include nil nil [1157 1182]) ("qdatetime.h" include (:system-flag t) nil [1199 1221]) ("qpaintdevicemetrics.h" include (:system-flag t) nil [1222 1254]) ("qsqlquery.h" include (:system-flag t) nil [1255 1277]) ("qregexp.h" include (:system-flag t) nil [1278 1298]) ("qvaluelist.h" include (:system-flag t) nil [1299 1322]) ("time.h" include (:system-flag t) nil [1323 1340]) ("tdelocale.h" include (:system-flag t) nil [1342 1362]) ("tdeabc/addressee.h" include (:system-flag t) nil [1363 1390]) ("kjs/interpreter.h" include (:system-flag t) nil [1434 1462]) ("kjsembed/kjsembedpart.h" include (:system-flag t) nil [1469 1503]) ("NUM_FIELDS" variable (:constant-flag t :default-value (nil)) nil [1553 1574]) ("TOK_ARTICLE_NO_CUSTOMER" variable (:pointer 1 :constant-flag t :default-value "\"article_no_customer\"" :type "char") nil [1576 1636]) ("TOK_BARCODE_NO_CUSTOMER" variable (:pointer 1 :constant-flag t :default-value "\"barcode_no_customer\"" :type "char") nil [1637 1697]) ("TOK_ARTICLE_DESC" variable (:pointer 1 :constant-flag t :default-value "\"article_desc\"" :type "char") nil [1698 1744]) ("TOK_ARTICLE_NO" variable (:pointer 1 :constant-flag t :default-value "\"article_no\"" :type "char") nil [1745 1787]) ("TOK_CUSTOMER_NO" variable (:pointer 1 :constant-flag t :default-value "\"customer_no\"" :type "char") nil [1788 1832]) ("TOK_CUSTOEMR_NAME" variable (:pointer 1 :constant-flag t :default-value "\"customer_name\"" :type "char") nil [1833 1881]) ("TOK_BARCODE_NO" variable (:pointer 1 :constant-flag t :default-value "\"barcode_no\"" :type "char") nil [1882 1924]) ("TOK_BARCODE_NO_BASIC" variable (:pointer 1 :constant-flag t :default-value "\"barcode_no_basic\"" :type "char") nil [1925 1979]) ("TOK_GROUP" variable (:pointer 1 :constant-flag t :default-value "\"group\"" :type "char") nil [1980 2012]) ("TOK_ENCODING_TYPE" variable (:pointer 1 :constant-flag t :default-value "\"encoding_type\"" :type "char") nil [2013 2061]) ("TOK_ENCODING_TYPE_NAME" variable (:pointer 1 :constant-flag t :default-value "\"encoding_type_name\"" :type "char") nil [2062 2120]) ("TOK_LINE" variable (:pointer 1 :constant-flag t :default-value "\"line%1\"" :type "char") nil [2121 2153]) ("TOK_FIELD" variable (:pointer 1 :constant-flag t :default-value "\"field%1\"" :type "char") nil [2154 2188]) ("TOK_FILENAME" variable (:pointer 1 :constant-flag t :default-value "\"filename\"" :type "char") nil [2190 2228]) ("TOK_INDEX" variable (:pointer 1 :constant-flag t :default-value "\"index\"" :type "char") nil [2229 2261]) ("TOK_COL" variable (:pointer 1 :constant-flag t :default-value "\"col\"" :type "char") nil [2262 2290]) ("TOK_ROW" variable (:pointer 1 :constant-flag t :default-value "\"row\"" :type "char") nil [2291 2319]) ("TOK_PAGE" variable (:pointer 1 :constant-flag t :default-value "\"page\"" :type "char") nil [2320 2350]) ("TOK_RESOLUTION" variable (:pointer 1 :constant-flag t :default-value "\"resolution\"" :type "char") nil [2351 2393]) ("TOK_SERIAL" variable (:pointer 1 :constant-flag t :default-value "\"serial\"" :type "char") nil [2394 2428]) ("TOK_JS" variable (:pointer 1 :constant-flag t :default-value "\"js:\"" :type "char") nil [2430 2457]) ("TOK_SQL" variable (:pointer 1 :constant-flag t :default-value "\"sqlquery:\"" :type "char") nil [2458 2492]) ("TOK_VAR" variable (:pointer 1 :constant-flag t :default-value "\"$\"" :type "char") nil [2493 2519]) ("TOK_DATE" variable (:pointer 1 :constant-flag t :default-value "\"date\"" :type "char") nil [2521 2551]) ("TOK_DATE_a" variable (:pointer 1 :constant-flag t :default-value "\"date:%a\"" :type "char") nil [2552 2587]) ("TOK_DATE_A" variable (:pointer 1 :constant-flag t :default-value "\"date:%A\"" :type "char") nil [2588 2623]) ("TOK_DATE_b" variable (:pointer 1 :constant-flag t :default-value "\"date:%b\"" :type "char") nil [2624 2659]) ("TOK_DATE_B" variable (:pointer 1 :constant-flag t :default-value "\"date:%B\"" :type "char") nil [2660 2695]) ("TOK_DATE_c" variable (:pointer 1 :constant-flag t :default-value "\"date:%c\"" :type "char") nil [2696 2731]) ("TOK_DATE_C" variable (:pointer 1 :constant-flag t :default-value "\"date:%C\"" :type "char") nil [2732 2767]) ("TOK_DATE_d" variable (:pointer 1 :constant-flag t :default-value "\"date:%d\"" :type "char") nil [2768 2803]) ("TOK_DATE_D" variable (:pointer 1 :constant-flag t :default-value "\"date:%D\"" :type "char") nil [2804 2839]) ("TOK_DATE_e" variable (:pointer 1 :constant-flag t :default-value "\"date:%e\"" :type "char") nil [2840 2875]) ("TOK_DATE_F" variable (:pointer 1 :constant-flag t :default-value "\"date:%F\"" :type "char") nil [2876 2911]) ("TOK_DATE_g" variable (:pointer 1 :constant-flag t :default-value "\"date:%g\"" :type "char") nil [2912 2947]) ("TOK_DATE_G" variable (:pointer 1 :constant-flag t :default-value "\"date:%G\"" :type "char") nil [2948 2983]) ("TOK_DATE_H" variable (:pointer 1 :constant-flag t :default-value "\"date:%H\"" :type "char") nil [2984 3019]) ("TOK_DATE_I" variable (:pointer 1 :constant-flag t :default-value "\"date:%I\"" :type "char") nil [3020 3055]) ("TOK_DATE_J" variable (:pointer 1 :constant-flag t :default-value "\"date:%J\"" :type "char") nil [3056 3091]) ("TOK_DATE_m" variable (:pointer 1 :constant-flag t :default-value "\"date:%m\"" :type "char") nil [3092 3127]) ("TOK_DATE_M" variable (:pointer 1 :constant-flag t :default-value "\"date:%M\"" :type "char") nil [3128 3163]) ("TOK_DATE_p" variable (:pointer 1 :constant-flag t :default-value "\"date:%p\"" :type "char") nil [3164 3199]) ("TOK_DATE_r" variable (:pointer 1 :constant-flag t :default-value "\"date:%r\"" :type "char") nil [3200 3235]) ("TOK_DATE_R" variable (:pointer 1 :constant-flag t :default-value "\"date:%R\"" :type "char") nil [3236 3271]) ("TOK_DATE_S" variable (:pointer 1 :constant-flag t :default-value "\"date:%S\"" :type "char") nil [3272 3307]) ("TOK_DATE_T" variable (:pointer 1 :constant-flag t :default-value "\"date:%T\"" :type "char") nil [3308 3343]) ("TOK_DATE_u" variable (:pointer 1 :constant-flag t :default-value "\"date:%u\"" :type "char") nil [3344 3379]) ("TOK_DATE_U" variable (:pointer 1 :constant-flag t :default-value "\"date:%U\"" :type "char") nil [3380 3415]) ("TOK_DATE_V" variable (:pointer 1 :constant-flag t :default-value "\"date:%V\"" :type "char") nil [3416 3451]) ("TOK_DATE_w" variable (:pointer 1 :constant-flag t :default-value "\"date:%w\"" :type "char") nil [3452 3487]) ("TOK_DATE_W" variable (:pointer 1 :constant-flag t :default-value "\"date:%W\"" :type "char") nil [3488 3523]) ("TOK_DATE_x" variable (:pointer 1 :constant-flag t :default-value "\"date:%x\"" :type "char") nil [3524 3559]) ("TOK_DATE_X" variable (:pointer 1 :constant-flag t :default-value "\"date:%X\"" :type "char") nil [3560 3595]) ("TOK_DATE_y" variable (:pointer 1 :constant-flag t :default-value "\"date:%y\"" :type "char") nil [3596 3631]) ("TOK_DATE_Y" variable (:pointer 1 :constant-flag t :default-value "\"date:%Y\"" :type "char") nil [3632 3667]) ("TOK_DATE_z" variable (:pointer 1 :constant-flag t :default-value "\"date:%z\"" :type "char") nil [3668 3703]) ("TOK_DATE_Z" variable (:pointer 1 :constant-flag t :default-value "\"date:%Z\"" :type "char") nil [3704 3739]) ("TOK_ADDRESS_NAME" variable (:pointer 1 :constant-flag t :default-value "\"address_name\"" :type "char") nil [3741 3787]) ("TOK_ADDRESS_GIVEN_NAME" variable (:pointer 1 :constant-flag t :default-value "\"address_givenname\"" :type "char") nil [3788 3845]) ("TOK_ADDRESS_FAMILY_NAME" variable (:pointer 1 :constant-flag t :default-value "\"address_familyname\"" :type "char") nil [3846 3905]) ("TOK_ADDRESS_EMAIL" variable (:pointer 1 :constant-flag t :default-value "\"address_email\"" :type "char") nil [3906 3954]) ("TOK_ADDRESS_FULL_EMAIL" variable (:pointer 1 :constant-flag t :default-value "\"address_fullemail\"" :type "char") nil [3955 4012]) ("TOK_ADDRESS_PHONE_PREF" variable (:pointer 1 :constant-flag t :default-value "\"address_phone\"" :type "char") nil [4013 4066]) ("TOK_ADDRESS_PHONE_HOME" variable (:pointer 1 :constant-flag t :default-value "\"address_phonehome\"" :type "char") nil [4067 4124]) ("TOK_ADDRESS_PHONE_WORK" variable (:pointer 1 :constant-flag t :default-value "\"address_phonework\"" :type "char") nil [4125 4182]) ("TOK_ADDRESS_PHONE_MSG" variable (:pointer 1 :constant-flag t :default-value "\"address_phonemsg\"" :type "char") nil [4183 4238]) ("TOK_ADDRESS_PHONE_VOICE" variable (:pointer 1 :constant-flag t :default-value "\"address_phonevoice\"" :type "char") nil [4239 4298]) ("TOK_ADDRESS_PHONE_FAX" variable (:pointer 1 :constant-flag t :default-value "\"address_phonefax\"" :type "char") nil [4299 4354]) ("TOK_ADDRESS_PHONE_CELL" variable (:pointer 1 :constant-flag t :default-value "\"address_phonemobile\"" :type "char") nil [4355 4414]) ("TOK_ADDRESS_PHONE_VIDEO" variable (:pointer 1 :constant-flag t :default-value "\"address_phonevideo\"" :type "char") nil [4415 4474]) ("TOK_ADDRESS_PHONE_BBS" variable (:pointer 1 :constant-flag t :default-value "\"address_phonebbs\"" :type "char") nil [4475 4530]) ("TOK_ADDRESS_PHONE_MODEM" variable (:pointer 1 :constant-flag t :default-value "\"address_phonemodem\"" :type "char") nil [4531 4590]) ("TOK_ADDRESS_PHONE_CAR" variable (:pointer 1 :constant-flag t :default-value "\"address_phonecar\"" :type "char") nil [4591 4646]) ("TOK_ADDRESS_PHONE_ISDN" variable (:pointer 1 :constant-flag t :default-value "\"address_phoneisdn\"" :type "char") nil [4647 4704]) ("TOK_ADDRESS_PHONE_PCS" variable (:pointer 1 :constant-flag t :default-value "\"address_phonepcs\"" :type "char") nil [4705 4760]) ("TOK_ADDRESS_PHONE_PAGER" variable (:pointer 1 :constant-flag t :default-value "\"address_phonepager\"" :type "char") nil [4761 4820]) ("TOK_ADDRESS_ADDRESS_POB" variable (:pointer 1 :constant-flag t :default-value "\"address_postofficebox\"" :type "char") nil [4821 4883]) ("TOK_ADDRESS_ADDRESS_EXTENDED" variable (:pointer 1 :constant-flag t :default-value "\"address_extended\"" :type "char") nil [4884 4946]) ("TOK_ADDRESS_ADDRESS_STREET" variable (:pointer 1 :constant-flag t :default-value "\"address_street\"" :type "char") nil [4947 5005]) ("TOK_ADDRESS_ADDRESS_LOCALITY" variable (:pointer 1 :constant-flag t :default-value "\"address_locality\"" :type "char") nil [5006 5068]) ("TOK_ADDRESS_ADDRESS_REGION" variable (:pointer 1 :constant-flag t :default-value "\"address_region\"" :type "char") nil [5069 5127]) ("TOK_ADDRESS_ADDRESS_POSTALCODE" variable (:pointer 1 :constant-flag t :default-value "\"address_postalcode\"" :type "char") nil [5128 5194]) ("TOK_ADDRESS_ADDRESS_COUNTRY" variable (:pointer 1 :constant-flag t :default-value "\"address_country\"" :type "char") nil [5195 5255]) ("TOK_ADDRESS_ADDRESS_LABEL" variable (:pointer 1 :constant-flag t :default-value "\"address_label\"" :type "char") nil [5256 5312]) ("TOK_ADDRESS" variable (:pointer 1 :constant-flag t :default-value "\"address\"" :type "char") nil [5313 5349]) ("TOK_ADDRESS_URL" variable (:pointer 1 :constant-flag t :default-value "\"address_url\"" :type "char") nil [5357 5401]) ("TOK_ADDRESS_NICK" variable (:pointer 1 :constant-flag t :default-value "\"address_nick\"" :type "char") nil [5402 5448]) ("TOK_ADDRESS_ADDITIONAL_NAME" variable (:pointer 1 :constant-flag t :default-value "\"address_addtionalname\"" :type "char") nil [5449 5515]) ("TOK_ADDRESS_PREFIX" variable (:pointer 1 :constant-flag t :default-value "\"address_prefix\"" :type "char") nil [5516 5566]) ("TOK_ADDRESS_SUFFIX" variable (:pointer 1 :constant-flag t :default-value "\"address_suffix\"" :type "char") nil [5567 5617]) ("TOK_ADDRESS_BIRTHDAY" variable (:pointer 1 :constant-flag t :default-value "\"address_birthday\"" :type "char") nil [5618 5672]) ("TOK_ADDRESS_TITLE" variable (:pointer 1 :constant-flag t :default-value "\"address_title\"" :type "char") nil [5673 5721]) ("TOK_ADDRESS_ROLE" variable (:pointer 1 :constant-flag t :default-value "\"address_role\"" :type "char") nil [5722 5768]) ("TOK_ADDRESS_NOTE" variable (:pointer 1 :constant-flag t :default-value "\"address_note\"" :type "char") nil [5769 5815]) ("TOK_ADDRESS_ORGANIZATION" variable (:pointer 1 :constant-flag t :default-value "\"address_organization\"" :type "char") nil [5816 5878]) ("TokenProvider" function (:constructor-flag t :parent "TokenProvider" :arguments (("paintdevice" variable (:pointer 1 :type ("QPaintDevice" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5910 5937])) :type ("TokenProvider" type "class")) nil [5880 6579]) ("TokenProvider" function (:destructor-flag t :parent "TokenProvider" :type "void") nil [6581 6616]) ("TokenProvider::s_categories" variable (:type ("QValueList" type (:type "class") nil nil)) nil [6618 6670]) ("TokenProvider::s_captions" variable (:type ("QMap" type (:type "class") nil nil)) nil [6671 6738]) ("TokenProvider::s_interpreter" variable (:pointer 1 :default-value "NULL;" :type ("KJS::Interpreter" type (:type "class") nil nil)) nil [6759 6813]) ("TokenProvider::s_interpreter" variable (:pointer 1 :default-value "NULL;" :type ("KJSEmbed::KJSEmbedPart" type (:type "class") nil nil)) nil [6820 6880]) ("hasJavaScript" function (:parent "TokenProvider" :type ("bool" type (:type "class") nil nil)) nil [6905 7032]) ("getTokens" function (:pointer 1 :parent "TokenProvider" :type ("QValueList" type (:type "class") nil nil)) nil [7034 7143]) ("init" function (:parent "TokenProvider" :type "void") nil [7145 17408]) ("findBrackets" function (:parent "TokenProvider" :arguments (("text" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17445 17460]) ("" variable (:type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17461 17501])) :type "void") nil [17411 18736]) ("parse" function (:parent "TokenProvider" :arguments (("text" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [18768 18790])) :type ("QString" type (:type "class") nil nil)) nil [18738 18889]) ("listUserVars" function (:parent "TokenProvider" :type ("QStringList" type (:type "class") nil nil)) nil [18891 19537]) ("processUserVars" function (:parent "TokenProvider" :arguments (("t" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19579 19598])) :type ("QString" type (:type "class") nil nil)) nil [19539 20032]) ("process" function (:parent "TokenProvider" :arguments (("t" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [20066 20085])) :type ("QString" type (:type "class") nil nil)) nil [20034 24091]) ("processAddresses" function (:parent "TokenProvider" :arguments (("t" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [24134 24153])) :type ("QString" type (:type "class") nil nil)) nil [24093 29616]) ("query" function (:parent "TokenProvider" :arguments (("query" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [29648 29671])) :type ("QString" type (:type "class") nil nil)) nil [29618 29867]) ("jsParse" function (:parent "TokenProvider" :arguments (("script" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [29901 29925])) :type ("QString" type (:type "class") nil nil)) nil [29869 31283]) ("jsParseToBool" function (:parent "TokenProvider" :arguments (("script" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [31320 31344])) :type ("bool" type (:type "class") nil nil)) nil [31285 31681]) ("createSerial" function (:parent "TokenProvider" :constant-flag t :type ("QString" type (:type "class") nil nil)) nil [31683 32384]) ("unescapeText" function (:parent "TokenProvider" :arguments (("t" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [32423 32442])) :type ("QString" type (:type "class") nil nil)) nil [32386 32692]) ("escapeText" function (:parent "TokenProvider" :arguments (("t" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [32729 32748])) :type ("QString" type (:type "class") nil nil)) nil [32694 33053]))
-    :file "tokenprovider.cpp"
-    :pointmax 33054
-    )
-   )
-  :file "semantic.cache"
-  :semantic-tag-version "2.0pre3"
-  :semanticdb-version "2.0pre3"
-  )
diff --git a/kbarcode/sqltables.h b/kbarcode/sqltables.h
index 12f4ab4..36c08ab 100644
--- a/kbarcode/sqltables.h
+++ b/kbarcode/sqltables.h
@@ -30,10 +30,6 @@
 #define TABLE_BASIC "barcode_basic"
 /* -------- */
 
-// a macro to support TQString::replace( TQString, TQString )
-// also on QT 3.0.x
-#define DSREPLACE( x ) x
-
 // Holds all information
 // necessary for connecting
 // to a database
diff --git a/kbarcode/tdeactionmap.cpp b/kbarcode/tdeactionmap.cpp
deleted file mode 100644
index becffdd..0000000
--- a/kbarcode/tdeactionmap.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/***************************************************************************
-                          tdeactionmap.cpp  -  description
-                             -------------------
-    begin                : Fri Mai 19 2006
-    copyright            : (C) 2006 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "tdeactionmap.h"
-
-#include <tqimage.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqmenubar.h>
-#include <tqmenudata.h>
-#include <tqpixmap.h>
-#include <tqpopupmenu.h>
-#include <tqregexp.h>
-#include <tqvbox.h>
-
-#include <tdeaction.h>
-#include <tdeapplication.h>
-#include <tdelistview.h>
-#if TDE_VERSION >= 0x030500
-#include <tdelistviewsearchline.h>
-#endif
-#include <tdelocale.h>
-
-class TDEListViewActionItem : public TDEListViewItem {
-public:
-    TDEListViewActionItem( TDEListView* parent, TDEAction* action )
-        : TDEListViewItem( parent ), m_action( action )
-        {
-            TQPixmap  pix;
-            TQSize    size    = TQIconSet::iconSize( TQIconSet::Large );
-            TQIconSet iconset = m_action->iconSet( TDEIcon::Panel, TDEIcon::SizeLarge );
-            TQRegExp  regtag( "<[^>]*>" );
-
-            pix = iconset.pixmap( TQIconSet::Large, TQIconSet::Normal ); // m_action->isEnabled() ? TQIconSet::Normal : TQIconSet::Disabled );
-            if( pix.isNull() )
-            {
-                pix.resize( size );
-                pix.fill( backgroundColor() );
-            }
-            else
-            {
-                if( pix.size() != size )
-                {
-                    pix = pix.convertToImage().smoothScale( size );
-                }
-            }
-
-            setText( 0, m_action->plainText() );
-            setText( 1, m_action->shortcutText() );
-            // replace HTML tags in What's this help
-            setText( 2, m_action->whatsThis().replace( regtag, "" ) );
-            setPixmap( 0, pix );
-        }
-
-    void paintCell( TQPainter *p, const TQColorGroup &cg,
-                                int column, int width, int alignment )
-        {
-            TQColorGroup _cg( cg );
-            TQColor c = _cg.text();
-            if( m_action && !m_action->isEnabled() )
-                _cg.setColor( TQColorGroup::Text, TQt::gray );
-            
-            TDEListViewItem::paintCell( p, _cg, column, width, alignment );
-            _cg.setColor( TQColorGroup::Text, c );
-        }
-
-    inline TDEAction* action() const 
-        {
-            return m_action;
-        }
-
-private:
-    TDEAction* m_action;
-};
-
-TDEActionMapDlg::TDEActionMapDlg( TDEActionCollection* actions, TQWidget* parent, const char* name )
-    : KDialogBase( parent, name, false, i18n("Action Map"), KDialogBase::Close, KDialogBase::Close )
-{
-    TQVBox *page = makeVBoxMainWidget();
-
-    new TQLabel( i18n("Find and execute actions."), page );
-    m_map = new TDEActionMap( actions, page );
-
-    show();
-}
-
-void TDEActionMapDlg::updateEnabledState()
-{
-    m_map->updateEnabledState();
-}
-
-TDEActionMap::TDEActionMap( TDEActionCollection* actions, TQWidget* parent, const char* name )
-    : TQWidget( parent, name ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false )
-{
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-
-    m_listView   = new TDEListView( this );
-#if TDE_VERSION >= 0x030500
-    m_searchLine = new TDEListViewSearchLineWidget( m_listView, this );
-#endif
-
-    m_listView->addColumn( i18n("Action") );
-    m_listView->addColumn( i18n("Shortcut") );
-    m_listView->addColumn( i18n("Description") );
-    m_listView->setColumnWidthMode( 0, TQListView::Maximum );
-    m_listView->setColumnWidthMode( 1, TQListView::Maximum );
-    m_listView->setColumnWidthMode( 2, TQListView::Manual );
-    m_listView->setSorting( 0 );
-    m_listView->setAllColumnsShowFocus( true );
-
-#if TDE_VERSION >= 0x030500
-    layout->addWidget( m_searchLine );
-#endif 
-    layout->addWidget( m_listView );
-
-    connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), this, TQT_SLOT( slotExecuteAction( TQListViewItem* ) ) );
-    connect( actions, TQT_SIGNAL( inserted( TDEAction* ) ), this, TQT_SLOT( slotActionCollectionChanged() ) );
-    connect( actions, TQT_SIGNAL( removed( TDEAction* ) ), this, TQT_SLOT( slotActionCollectionChanged() ) );
-    slotActionCollectionChanged();
-}
-
-TDEActionMap::~TDEActionMap()
-{
-
-}
-
-void TDEActionMap::slotActionCollectionChanged()
-{
-    TDEActionPtrList                 actions;
-    TDEActionPtrList::const_iterator it;
-
-    m_listView->clear();
-    
-    if( !m_actions )
-        return;
-
-    actions = m_actions->actions();
-    it = actions.begin();
-
-    while( it != actions.end() )
-    {
-        /*
-        if( m_showMenuTree ) 
-        {
-        }
-        */
-
-        new TDEListViewActionItem( m_listView, (*it) );
-
-        connect( *it, TQT_SIGNAL( enabled(bool) ), this, TQT_SLOT( updateEnabledState() ) );
-
-        ++it;
-    }
-    
-}
-
-void TDEActionMap::slotExecuteAction( TQListViewItem* item )
-{
-    TDEListViewActionItem* action = dynamic_cast<TDEListViewActionItem*>(item);
-    if( !action )
-        return;
-
-    if( !action->action()->isEnabled() )
-        return;
-
-    action->action()->activate();
-}
-
-void TDEActionMap::updateEnabledState()
-{
-    m_listView->repaintContents();
-}
-
-#include "tdeactionmap.moc"
diff --git a/kbarcode/tdeactionmap.h b/kbarcode/tdeactionmap.h
deleted file mode 100644
index 023647f..0000000
--- a/kbarcode/tdeactionmap.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          tdeactionmap.h  -  description
-                             -------------------
-    begin                : Fri Mai 19 2006
-    copyright            : (C) 2006 by Dominik Seichter
-    email                : [email protected]
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _TDEACTION_MAP_H_
-#define _TDEACTION_MAP_H_
-
-#include <tqwidget.h>
-#include <tdeversion.h>
-#include <kdialogbase.h>
-
-class TDEActionCollection;
-class TDEActionMap;
-#if TDE_VERSION >= 0x030500
-class TDEListViewSearchLineWidget;
-#endif 
-class TDEListView;
-class TQListViewItem;
-
-/** Open a simple dialog containing an action map.
- */
-class TDEActionMapDlg : public KDialogBase {
- public:
-    TDEActionMapDlg( TDEActionCollection* actions, TQWidget* parent = NULL, const char* name = NULL );
-
-    /** Call this function whenever you changed the enabled/disalbed state of an action
-     *  in your application.
-     */
-    void updateEnabledState();
-
- private:
-    TDEActionMap* m_map;
-};
-
-/**
- *
- * This class is an implementation of an Action Map for KDE.
- *
- *
- * What is an Action Map?
- *
- * Almost every web page has a site map. According to Wikipedia, 
- * a site map "helps visitors, and search engine robots, to find
- * pages on the site". Similar an Action Map should help the
- * user to find actions (i.e. functions or menu items) in an application.
- *
- * More concrete an Action Map is a dialog with a list of all 
- * actions (i.e. make text bold, save file or insert image) 
- * that can be performed in the application at its current state. 
- * Additionally there is a search box at the top of the list so
- * that the user can search the list easily for a special action. 
- * The action is executed by clicking on it. Disabled actions are
- * grayed out and cannot be clicked. The dialog is modeless so that 
- * it can always be open and the normal usage of the application is not disturbed.
- */
-class TDEActionMap : public TQWidget {
-    Q_OBJECT
-  
- public:
-    /** Creates a new TDEActionMap widget
-     *  @param action all actions from this TDEActionCollection are displayed.
-     *  @param parent the parent
-     *  @param name   the name
-     */
-    TDEActionMap( TDEActionCollection* actions, TQWidget* parent = NULL, const char* name = NULL );
-    ~TDEActionMap();
-
- public slots:
-    /** Call this function whenever you changed the enabled/disalbed state of an action
-     *  in your application.
-     */
-    void updateEnabledState();
-
- private slots:
-    void slotActionCollectionChanged();
-    void slotExecuteAction( TQListViewItem* item );
-
- private:
-    TDEActionCollection*         m_actions;
-    TDEListView*                 m_listView;
-#if TDE_VERSION >= 0x030500
-    TDEListViewSearchLineWidget* m_searchLine;
-#endif
-
-    bool                       m_showMenuTree;
-    bool                       m_grayOutItems;
-};
-
-#endif // _TDEACTION_MAP_H_
diff --git a/kbarcode/textitem.cpp b/kbarcode/textitem.cpp
index 578ee28..a182a6d 100644
--- a/kbarcode/textitem.cpp
+++ b/kbarcode/textitem.cpp
@@ -98,22 +98,10 @@ void TextItem::draw(TQPainter* painter)
 
     painter->rotate( m_rotation );
 
-    if( !TextItem::IsTQtTextRenderingBroken() )
-    {
-        painter->setPen( TQt::black );
-        srt.setWidth( painter, w );
-        srt.draw( painter, 0, 0, TQRect( 0, 0, w, h ), cg );
-    }
-    else
-    {
-        TQRect r( 0, 0, width, height );
-        TQPicture picture;
-        TQPainter p( &picture );
-        LabelUtils::renderString( &p, t, r, scalex, scaley );
-        p.end();
-        painter->drawPicture( 0, 0, picture );
-    }
-    
+    painter->setPen( TQt::black );
+    srt.setWidth( painter, w );
+    srt.draw( painter, 0, 0, TQRect( 0, 0, w, h ), cg );
+
     painter->restore();
     
     DocumentItem::drawBorder( painter );    
@@ -210,43 +198,3 @@ void TextItem::setText (const TQString & text)
     m_text = text;    
 }
 
-bool TextItem::s_qt_broken_init = false;
-bool TextItem::s_qt_broken = false;
-
-bool TextItem::IsTQtTextRenderingBroken()
-{
-    if( !s_qt_broken_init )
-    {
-        TQString version( tqVersion() );
-//        tqDebug( "Detected TQt Version: %s", version.latin1() );
-        int major = version.section( ".", 0, 0 ).toInt();
-        int minor = version.section( ".", 1, 1 ).toInt();
-        int bugfix = version.section( ".", 2, 2 ).toInt();
-    
-        if( major >= 3 )
-        {
-            if( major == 3 && minor < 3 )
-                s_qt_broken = true;
-            else if( major == 3 && minor == 3 )
-            {
-                if( bugfix < 2 )
-                    s_qt_broken = true;
-                else
-                    s_qt_broken = false;
-            }
-            else
-                s_qt_broken =  false;
-        }
-        else
-            s_qt_broken = true;
-        
-        if( s_qt_broken )
-            tqDebug("TQt's text redering is broken - using KBarcode fix.");
-                
-        s_qt_broken_init = true;
-        return s_qt_broken;
-    }
-    else
-        return s_qt_broken;
-}
-
diff --git a/kbarcode/textitem.h b/kbarcode/textitem.h
index 9c0b5a2..b415a82 100644
--- a/kbarcode/textitem.h
+++ b/kbarcode/textitem.h
@@ -24,7 +24,7 @@ class LabelEditor;
 
 /**
  * Class TextItem
- * Formated rich text (drawn using either DSRichText or TQSimpleRichText - once it is bug free) on screen or printer.
+ * Formated rich text (drawn using TQSimpleRichText) on screen or printer.
  */
 class TextItem : public DocumentItem {
 public:
@@ -46,14 +46,10 @@ public:
     inline void setRotation( double rot ) { m_rotation = rot; }
     inline double rotation() const { return m_rotation; }
 
-    static bool IsTQtTextRenderingBroken();
 private:
     void init();
     
 private:
-    static bool s_qt_broken;
-    static bool s_qt_broken_init;
-
     double m_rotation;
     TQString m_text;
 };
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index 18a08f7..a0c561e 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -98,12 +98,12 @@ void TextLineEditor::setupActions()
  
 
     TQStringList fuentes;
-    fuentes += "Tiems Roman (Medium) 8 point";
-    fuentes += "Tiems Roman (Medium) 10 point";
-    fuentes += "Tiems Roman (Bold) 10 point";
-    fuentes += "Tiems Roman (Bold) 12 point";
-    fuentes += "Tiems Roman (Bold) 14 point";
-    fuentes += "Tiems Roman (Italic) 12 point";
+    fuentes += "Times Roman (Medium) 8 point";
+    fuentes += "Times Roman (Medium) 10 point";
+    fuentes += "Times Roman (Bold) 10 point";
+    fuentes += "Times Roman (Bold) 12 point";
+    fuentes += "Times Roman (Bold) 14 point";
+    fuentes += "Times Roman (Italic) 12 point";
     fuentes += "Helvetica (Medium) 6 point";
     fuentes += "Helvetica (Medium) 10 point";
     fuentes += "Helvetica (Medium) 12 point";
diff --git a/kbarcode/textlineitem.cpp b/kbarcode/textlineitem.cpp
index 22f696f..5871894 100644
--- a/kbarcode/textlineitem.cpp
+++ b/kbarcode/textlineitem.cpp
@@ -68,16 +68,9 @@ void TextLineItem::draw(TQPainter* painter)
 
     painter->save();
 
-    if( !TextLineItem::IsTQtTextRenderingBroken() )
-    {
-        painter->scale( scalex, scaley );
-        painter->setPen( TQt::black );
-        srt.draw( painter, (int)((double)rect().x() / scalex ), (int)((double)rect().y() / scaley), r, cg );
-    }
-    else
-    {
-        LabelUtils::renderString( painter, text, r, scalex, scaley );
-    }
+    painter->scale( scalex, scaley );
+    painter->setPen( TQt::black );
+    srt.draw( painter, (int)((double)rect().x() / scalex ), (int)((double)rect().y() / scaley), r, cg );
 
     painter->restore();
 
@@ -207,40 +200,3 @@ int TextLineItem::getMagHor () const
 {
     return m_mag_hor;
 }
-
-bool TextLineItem::s_qt_broken_init = false;
-bool TextLineItem::s_qt_broken = false;
-
-bool TextLineItem::IsTQtTextRenderingBroken()
-{
-    if( !s_qt_broken_init )
-    {
-        TQString version( tqVersion() );
-        int major = version.section( ".", 0, 0 ).toInt();
-        int minor = version.section( ".", 1, 1 ).toInt();
-        int bugfix = version.section( ".", 2, 2 ).toInt();
-
-        if( major >= 3 )
-        {
-            if( major == 3 && minor < 3 )
-                s_qt_broken = true;
-            else if( major == 3 && minor == 3 )
-            {
-                if( bugfix < 2 )
-                    s_qt_broken = true;
-                else
-                    s_qt_broken = false;
-            }
-            else
-                s_qt_broken =  false;
-        }
-        else
-            s_qt_broken = true;
-
-        s_qt_broken_init = true;
-        return s_qt_broken;
-    }
-    else
-        return s_qt_broken;
-}
-
diff --git a/kbarcode/textlineitem.h b/kbarcode/textlineitem.h
index 2b86486..75bc307 100644
--- a/kbarcode/textlineitem.h
+++ b/kbarcode/textlineitem.h
@@ -22,7 +22,7 @@
 
 /**
  * Class TextLineItem
- * plain text (drawn using either DSRichText or TQSimpleRichText - once it is bug free) on screen or printer.
+ * plain text (drawn using TQSimpleRichText) on screen or printer.
  */
 class TextLineItem : public DocumentItem {
 public:
@@ -46,14 +46,10 @@ public:
     void setMagVert (int count);
     TQString  text () const;
     
-    static bool IsTQtTextRenderingBroken();
 private:
     void init();
     
 private:
-    static bool s_qt_broken;
-    static bool s_qt_broken_init;
-    
     TQString m_text;
     int m_font;
     int m_rotate;
diff --git a/kbarcode/tokenprovider.cpp b/kbarcode/tokenprovider.cpp
index f0d4e0b..dfbe9a6 100644
--- a/kbarcode/tokenprovider.cpp
+++ b/kbarcode/tokenprovider.cpp
@@ -915,10 +915,10 @@ const TQString TokenProvider::createSerial()
 TQString TokenProvider::unescapeText( const TQString & t )
 {
     TQString tmp = t;
-    tmp = tmp.replace( DSREPLACE( "&lt;" ), "<" );
-    tmp = tmp.replace( DSREPLACE( "&gt;" ), ">" );
-    tmp = tmp.replace( DSREPLACE( "&amp;" ), "&" );
-    tmp = tmp.replace( DSREPLACE( "&quot;" ), "\"" );
+    tmp = tmp.replace( "&lt;", "<" );
+    tmp = tmp.replace( "&gt;", ">" );
+    tmp = tmp.replace( "&amp;", "&" );
+    tmp = tmp.replace( "&quot;", "\"" );
 
     return tmp;
 }
@@ -926,11 +926,11 @@ TQString TokenProvider::unescapeText( const TQString & t )
 TQString TokenProvider::escapeText( const TQString & t )
 {
     TQString tmp = t;
-    tmp = tmp.replace( DSREPLACE( "<" ), "&lt;" );
-    tmp = tmp.replace( DSREPLACE( ">" ), "&gt;" );
-    tmp = tmp.replace( DSREPLACE( "&" ), "&amp;"  );
-    tmp = tmp.replace( DSREPLACE( "\"" ), "&quot;" );
-    tmp = tmp.replace( DSREPLACE( "\n" ), "<br />" );
+    tmp = tmp.replace( "<", "&lt;" );
+    tmp = tmp.replace( ">", "&gt;" );
+    tmp = tmp.replace( "&", "&amp;"  );
+    tmp = tmp.replace( "\"", "&quot;" );
+    tmp = tmp.replace( "\n", "<br />" );
 
     return tmp;
 }
diff --git a/po/de.po b/po/de.po
index b7ed502..8a23282 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,21 +1,21 @@
 # translation of de.po to
 # German Translation of KBarcode
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 #
 # DOMINIK SEICHTER <[email protected]>, 2002,2003.
-# Dominik Seichter <[email protected]>, 2003, 2006.
+# Dominik Seichter <[email protected]>, 2003, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
-"PO-Revision-Date: 2006-02-21 13:07+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
+"PO-Revision-Date: 2007-10-13 15:30+0200\n"
 "Last-Translator: Dominik Seichter <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: _translatorinfo.cpp:1
 msgid ""
@@ -29,39 +29,39 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 msgid "&Encoding Type:"
 msgstr "&Codierungs Art:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 msgid "&Value:"
 msgstr "&Wert:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Text anzeigen"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Erweitert..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 msgid "&Insert Data Field..."
 msgstr "&Daten Feld einfügen..."
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 msgid "&Margin:"
 msgstr "&Rand:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 msgid "&Rotation:"
 msgstr "&Rotation:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 msgid "&Scale (in permille):"
 msgstr "&Skalierung (in Promille):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 msgid "&Crop:"
 msgstr "&Abschneiden:"
 
@@ -77,63 +77,63 @@ msgstr "&Erstellen"
 msgid "&Print"
 msgstr "&Drucken"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Fehler beim speichern des Bildes"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Barcode Einstellungen"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr "Barcode Writer in Pure Postscript"
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Farben"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Sequenz"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Modul Breite (mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 msgid "Barcode Height (mm):"
 msgstr "Barcode Höhe (in mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Escape Sequenzen übersetzen"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Text über dem Barcode"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Auto Korrektur"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "&Berechnungs Methode für Checksummen:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -142,143 +142,143 @@ msgstr ""
 "Dokumentation für Details. Normalerweise müssen Sie diesen Wert nicht ändern."
 "</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Keine Checksumme"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Standard Checksummen Methode"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Modulo 10 Checksumme"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Module 43 (empfohlen für Code39 und Logmars, 1 Stelle)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Module 47 (2 Stellen)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 Stelle)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 Stellen)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 Stelle)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 Stellen)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Reihen:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Spalten:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Fehler Korrektur:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "DataMatrix Symbol Größen (Reihen x Spalten):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Automatische Berechnung"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Sequenz einschalten"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Zahlen 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Buchstaben A-Z"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "A-Z, 0-9"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Schrittweite:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Start:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 msgid "Bar Color:"
 msgstr "Balken Farbe:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 msgid "Background Color:"
 msgstr "Hintergrund Farbe:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 msgid "Text Color:"
 msgstr "Text Farbe:"
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 msgid "Enable &Checksum"
 msgstr "Prüfsumme &anschalten"
 
@@ -294,7 +294,7 @@ msgstr "&Ausgabe Format:"
 msgid "&Print to File"
 msgstr "InDatei &drucken"
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 msgid "&Filename:"
 msgstr "&Dateiname:"
 
@@ -318,147 +318,91 @@ msgstr "Intermec Drucker (IPL)"
 msgid "EPCL Printer (EPCL)"
 msgstr "EPCL Drucker (EPCL)"
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 msgid " [GNU Barcode]"
 msgstr " [GNU Barcode]"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 msgid " [PDF 417]"
 msgstr " [PDF417]"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 msgid " [TBarcode]"
 msgstr " [TBarcode]"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 msgid " [TBarcode2]"
 msgstr " [TBarcode2]"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr " [Barcode Writer in Pure Postscript]"
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raw Code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 msgid "Codabar (no checksum)"
 msgstr "Codabar (ohne Checksumme)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c wird automatisch gewählt)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, komplettes druckbares ASCII"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (ohne Checksumme)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 oder EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "interleaved 2 of 5 (nur Zahlen, keine Checksumme)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (nur Zahlen)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-stelliges EAN; UPCA und UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2D Barcode"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr "Australische Post"
-
-#: barkode.cpp:731
-msgid "Code 11"
-msgstr "Code 11"
-
-#: barkode.cpp:733
-msgid "Code 2 of 5"
-msgstr "Code 2 aus 5"
-
-#: barkode.cpp:737
-msgid "EAN 2"
-msgstr "EAN 2"
-
-#: barkode.cpp:738
-msgid "EAN 5"
-msgstr "EAN 5"
-
-#: barkode.cpp:740
-msgid "Interleaved 2 of 5"
-msgstr "interleaved 2 aus 5"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr "ISBN"
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr "Kix (Niederländische Post)"
-
-#: barkode.cpp:745
-msgid "Postnet"
-msgstr "Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr "Rationalisiertes Codabar"
-
-#: barkode.cpp:747
-msgid "Royal Mail"
-msgstr "Royal Mail"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr "Symbol"
-
-#: barkode.cpp:749
-msgid "UPCA"
-msgstr "UPCA"
-
-#: barkode.cpp:750
-msgid "UPCE"
-msgstr "UPCE"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Drucke..."
 
@@ -476,421 +420,411 @@ msgstr "Artikel Nummer : "
 msgid "Creating Images..."
 msgstr "Bilder erstellen..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr "<qt>Kann die Datei oder das Gerät <b>%1</b> nicht öffnen.</qt>"
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
-msgstr "<qt>Dieser Assistent wird Sie beim Drucken von mehreren Labels mit KBarcode begleiten und Ihnen helfen.<br>Der erste Schritt ist es die KBarcode Label Datei auszuwählen, die Sie drucken wollen.</qt>"
+"want to print.</qt>"
+msgstr ""
+"<qt>Dieser Assistent wird Sie beim Drucken von mehreren Labels mit KBarcode "
+"begleiten und Ihnen helfen.<br>Der erste Schritt ist es die KBarcode Label "
+"Datei auszuwählen, die Sie drucken wollen.</qt> "
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 msgid "File Selection"
 msgstr "Datei Auswahl"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr "&Labels ohne Daten drucken"
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr "&Artikel aus KBarcodes SQL Datenbank drucken"
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr "&Variablen importieren und dann drucken"
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr "&Kontakte aus Ihrem Addressbuch drucken"
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr "Daten Quelle"
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 msgid "Print Data"
 msgstr "Daten drucken"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 msgid "Insert Row"
 msgstr "Reihe einfügen"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 msgid "Delete Row"
 msgstr "Reihe löschen"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 msgid "Import Variables"
 msgstr "Variablen importieren"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
-msgstr "<t>KBarcode kann fortlaufende Seriennummern auf die Label drucken. Wenn Sie das Kommando [seriel] nirgends auf Ihrem Label verwendet haben, können Sie diese Seite überspringen.<br>Start ist ein beliebiger Ausdruck der mindestens eine Zahl enthalten muss. Diese Zahl wird für jedes gedruckte Label auf dem Ausdruck erhöht.</qt>"
+"print out.</qt>"
+msgstr ""
+"<qt>KBarcode kann fortlaufende Seriennummern auf die Label drucken. Wenn Sie "
+"das Kommando [seriel] nirgends auf Ihrem Label verwendet haben, können Sie "
+"diese Seite überspringen.<br>Start ist ein beliebiger Ausdruck der "
+"mindestens eine Zahl enthalten muss. Diese Zahl wird für jedes gedruckte "
+"Label auf dem Ausdruck erhöht.</qt> "
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 msgid "Serial start:"
 msgstr "Startwert:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr "Inkrementierung:"
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr "Auf einen &Drucker oder in eine Datei drucken"
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 msgid "&Create images"
 msgstr "&Bilder erstellen"
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr "Auf einen speziellen &Barcode Drucker drucken"
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 msgid "Output &Directory:"
 msgstr "Ausgabe &Verzeichnis:"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 msgid "Output File &Format:"
 msgstr "Ausgabe Datei &Format:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "&Artikel Nummer als Dateiname verwenden"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "&Barcode Nummer als Dateiname verwenden"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 msgid "Use &custom filename:"
 msgstr "&Benutzerspezifischen Dateinamen verwenden:"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr "&Fenster auch nach dem Drucken geöffnet lassen"
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr "Ausgabe Gerät"
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Kunden Name und Nummer:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 msgid "&Add..."
 msgstr "&Hinzufügen..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 msgid "&Import..."
 msgstr "&Importieren..."
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 msgid "&Edit..."
 msgstr "&Bearbeiten..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "All&e Entfernen"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Aus Datei importieren..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Aus Zwischenablage importieren..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "barcode_basic importieren"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Index"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Anzahl der Labels"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Artikel Nummer"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Gruppe"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr "Daten per &Hand eingeben"
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr "Variablen aus einer &SQL Tabelle importieren"
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 msgid "Please enter a sql &query:"
 msgstr "Bitte geben Sie eine SQL &Abfrage ein:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 msgid "Import from a &CSV file"
 msgstr "Aus einer &CSV Datei importieren"
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr "Bitte wählen Sie eine CSV &Datei:"
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 msgid "&Encoding:"
 msgstr "&Codierungs Art:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr "Verfügbare Variablen:"
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 msgid "&Number of labels to print:"
 msgstr "&Anzahl der Labels die gedruckt werden sollen:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr "Fügt alle Kontakte in die Liste der Kontakte ein, die gedruckt werden sollen."
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
-msgstr "Fügt die markierten Kontakte in die Liste der Kontakte ein, die gedruckt werden sollen."
+msgstr ""
+"Fügt die markierten Kontakte in die Liste der Kontakte ein, die gedruckt "
+"werden sollen."
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid "Remove selected contacts from the list of contacts which will be printed."
-msgstr "Entfernt die markierten Kontakte aus der Liste der Kontakte, die gedruckt werden sollen."
+msgstr ""
+"Entfernt die markierten Kontakte aus der Liste der Kontakte, die gedruckt "
+"werden sollen."
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
-msgstr "Entfernt alle Kontakte aus der Liste der Kontakte, die gedruckt werden sollen."
+msgstr ""
+"Entfernt alle Kontakte aus der Liste der Kontakte, die gedruckt werden "
+"sollen."
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr "All Addressen"
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr "Ausgewählte Addressen"
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 msgid "Given Name"
 msgstr "Vorname"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 msgid "Family Name"
 msgstr "Name"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr "Email Addresse"
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+msgid "The label file %1 was not found"
+msgstr "Die Label Datei %1 konnte nicht gefunden werden."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Bitte geben Sie ein zulässige Artikel Nummer an"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Das Trennzeichen ist nicht gesetzt. Bitte weisen Sie ihm einen Wert zu."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Die folgenden Werte konnten nicht geladen werden:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Kann die SQL Anfrage nicht ausführen:<br>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr "Kann die Datei nicht öffnen: %1"
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Neues Rechteck"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Neu Linie"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Neuer Text"
 
-#: commands.cpp:477
+#: commands.cpp:475
 msgid "New TextLine"
 msgstr "Neue Textzeile"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Neuer Barcode"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Es sind %1 Barcodes im Cache."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "KBarcode Einrichtung..."
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "SQL Einstellungen"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Drucker Einstellungen"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Mittlere Auflösung (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Hohe Auflösung (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Sehr Hohe Auflösung (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Drucker Auflösung:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Vorschau Seiten Format:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Trennzeichen:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Quote Zeichen:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "Artikel Nummer des Kunden beim Import &benutzen"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Datei Format:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Menge"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Label Editor"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "Bei Label Editor Start &nach neuen Label fragen"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Gitter:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Gitter Farbe:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Datums Format:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Bei Neuem"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Bei Neuem Artikel"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Keine neue Zeile"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Neue Zeile"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "X Label einfügen"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Neue Seite"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Artikel Nummer"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Gruppe"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Bei Neuer Gruppe"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Barcode"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Barcode-Cache"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Größe des Barcode Cache's:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Leeren"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Bestimmt wie viele Barcodes auf der Festplatte zwischen gespeichert "
-"werden sollen. Wenn Sie regelmäßig viele Artikel drucken, sollten Sie diesen "
-"Wert auf die Anzahl der Artikel in Ihrer Datenbank setzen um einen "
-"schnelleren Druck zu erreichen. Ein Barcode benötigt im Cache ca. 20kb.</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Adressen Import"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Vorschau: "
 
@@ -946,7 +880,7 @@ msgstr ""
 "wird auch die Label Definition in die Datenbank importieren.<br>Danach "
 "können Sie auch Beispiel Daten in die Datenbank importieren."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Tabellen erstellen"
 
@@ -958,7 +892,7 @@ msgstr "&Beispiel Daten importieren"
 msgid "Create Tables"
 msgstr "Tabellen erstellen"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Datenbank aufruf fehlgeschlagen:<br>"
 
@@ -978,43 +912,95 @@ msgstr ""
 "Qt Quellcode Distribution und sollten auch in ihrer Distribution enthalten "
 "sein. Bitte installieren Sie zuerst die Treiber."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importieren"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Importiere die ausgewählte Datei in die SQL Tabelle."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+msgid "&Import Data"
+msgstr "Daten &importieren"
+
+#: csvimportdlg.cpp:104
+msgid "Other table..."
+msgstr "Andere Tabelle..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr "Gesamte Datei in die Vorschau &laden"
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr "Nur eine bestimmte Anzahl an Datensätzen laden:"
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Spalte:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Setzen"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Datenbankfeld, dass für diese Spalte benutzt werden soll:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Datei zum importieren:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 msgid "Encoding:"
 msgstr "Codierungs Art:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "In Tabelle importieren:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+msgid "Table Name:"
+msgstr "Tabellen Name:"
+
+#: csvimportdlg.cpp:151
+msgid "&Import Settings"
+msgstr "Einstellungen &importiere "
+
+#: csvimportdlg.cpp:157
+msgid "&CSV File"
+msgstr "&CSV Datei"
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr "Datei mit fester Feld-Breite"
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr "CSV Datei"
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr "Datei mit fester Feld-Breite"
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr "Feld &hinzufügen"
+
+#: csvimportdlg.cpp:210
+msgid "&Remove Field"
+msgstr "Feld &entfernen"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr "Kann die Daten nicht aus der Datei laden:"
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Konnte diese Zeile nicht importieren:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Daten wurden erfolgreich importiert."
 
@@ -1084,8 +1070,8 @@ msgstr "Vertikale Anzahl:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1142,7 +1128,7 @@ msgstr "&Rand"
 msgid "&Fill Color"
 msgstr "&Füll Farbe:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Barcode"
 
@@ -1154,7 +1140,7 @@ msgstr "&Rotation"
 msgid "&Text"
 msgstr "&Text"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 msgid "&Image"
 msgstr "&Bild"
 
@@ -1166,35 +1152,39 @@ msgstr "&Sichtbarkeit"
 msgid "Property changed"
 msgstr "Eigenschaft geändert"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "Einrichtungs Assistent &Starten..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Datenbank Verbindung"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Label Definitionen Importieren"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Beispiel Daten Importieren"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr "&Aktions-Verzeichnis..."
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&System Überprüfung..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "&Barcode Hilfe..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Spenden..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1202,11 +1192,11 @@ msgstr ""
 "<qt>Die KBarcode Dokumentation kann als PDF Datei von der KBarcode Webseite "
 "heruntergeladen werden.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Jetzt Herunterladen"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1214,25 +1204,25 @@ msgstr ""
 "<qt>Sie können die weitere Entwicklung von KBarcode durch Spenden fördern. "
 "PayPal wird zur Abwicklung der Spenden verwendet.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Jetzt spenden"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Barcode Unterstützung</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Nein</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Gefunden</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1240,15 +1230,15 @@ msgstr ""
 "<p>Um <b>Barcode Unterstützung</b> zu erhalten müssen Sie entweder <i>GNU "
 "Barcode</i>, <i>TBarcode</i> oder <i>PDF417 Enc</i> installieren.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Datenbank Unterstützung</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Treiber gefunden: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
 "<p><b>Keine Datenbank Treiber gefunden. SQL Unterstützung wurde abgeschalten."
@@ -1258,6 +1248,26 @@ msgstr ""
 msgid "Expression: "
 msgstr "Ausdruck: "
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr "Aktions-Verzeichnis"
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr "Aktionen tqfinden und ausführen."
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr "Aktion"
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr "Kürzel"
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+msgid "Description"
+msgstr "Beschreibung"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "Barcode &Generator..."
@@ -1290,179 +1300,183 @@ msgstr "&Kunden Bearbeiten"
 msgid "&Edit Customer Text"
 msgstr "&Customer Text Bearbeiten"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
-msgstr "%1 ist kein gültiges Ausgabe Format für --output. Gültige Werte sind POSTSCRIPT, IMAGE und BARCODE."
+"IMAGE and BARCODE."
+msgstr ""
+"%1 ist kein gültiges Ausgabe Format für --output. Gültige Werte sind "
+"POSTSCRIPT, IMAGE und BARCODE. "
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Fest"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Label Auswahl"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
-msgstr "<qt>Die Datei <b>%1</b> kann nicht geladen werden, da die dafür benötigten Label Definitionen fehlen.</qt>"
+msgstr ""
+"<qt>Die Datei <b>%1</b> kann nicht geladen werden, da die dafür benötigten "
+"Label Definitionen fehlen.</qt>"
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Label Schl&ießen"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "&Zuletzt geöffnete Dateien"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Batch Datei importieren und drucken..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Beschreibung ändern..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Objekt Löschen"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr "Auf &Barcode Drucker drucken..."
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 msgid "Print to &Image..."
 msgstr "Bilder &erstellen..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "Label &Ändern..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "&Barcode Einfügen"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "&Bild Einfügen"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "&Text Einfügen"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 msgid "Insert &Data Field"
 msgstr "&Daten Feld einfügen"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 msgid "Insert &Text Line"
 msgstr "&Textzeile Einfügen"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "&Linie Einfügen"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "&Rechteck Einfügen"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "&Ellipse Einfügen"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Gitter"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Vorschau..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Adreß&buch"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Einzelnen Barcode Erstellen..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "E&xtras"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Nach Ganz Oben"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Aufwärts"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Abwärts"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&In den Hintergrund"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "&Horizontaler Zentrieren"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "&Vertikale Zentrieren"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Reihenfolge"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Zentrieren"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr "&Position und Größe schützen"
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Label Beschreibung"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Bitte geben Sie eine Beschreibung ein:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Größe: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Label Vorlage: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 msgid "Protected Item"
 msgstr "Element geschützt"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Rechtschreibprüfung"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Die Datei %1 existiert nicht."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Das Dokument wurde verändert.<br><br>Wollen Sie es speichern ?</qt>"
 
@@ -1470,13 +1484,18 @@ msgstr "<qt>Das Dokument wurde verändert.<br><br>Wollen Sie es speichern ?</qt>
 msgid ""
 "Load the file in KBarcode (if --batch is specified, the file will be used in "
 "batchprinting mode)"
-msgstr "Die Datei in KBarcode laden (wenn die --batch Option benutzt wird, wird die Datei ins Batchdruck Modul geladen)"
+msgstr ""
+"Die Datei in KBarcode laden (wenn die --batch Option benutzt wird, wird die "
+"Datei ins Batchdruck Modul geladen)"
 
 #: main.cpp:36
 msgid ""
 "Print any loaded files immediately on the default printer or on the printer "
 "specified by the --printer commandline option and exit afterwards"
-msgstr "Drucke alle geladenen Dateien sofort auf dem Standard Drucker oder auf dem Drucker der mit der --printer Option angegeben wurde und beende KBarcode danach"
+msgstr ""
+"Drucke alle geladenen Dateien sofort auf dem Standard Drucker oder auf dem "
+"Drucker der mit der --printer Option angegeben wurde und beende KBarcode "
+"danach"
 
 #: main.cpp:38
 msgid "Printer/destination to print on"
@@ -1529,7 +1548,7 @@ msgid "Import variable data from a specified csv file"
 msgstr "Daten aus einer CSV Datei importieren"
 
 #: main.cpp:75
-msgid "Kbarcode"
+msgid "KBarcode"
 msgstr "KBarcode"
 
 #: main.cpp:76
@@ -1656,10 +1675,6 @@ msgstr "&Rechts Bündig"
 msgid "&Justify"
 msgstr "&Blocksatz"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Barcode nicht zulässig!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Position: "
@@ -1876,93 +1891,95 @@ msgstr "&Schnittgrenzen drucken (Rand)"
 msgid "Image Saved in KBarcode"
 msgstr "Bild in KBarcode gespeichert"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr "&Rand sichtbar"
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Farbe:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Linien Breite:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Linien Stil:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 msgid "90"
 msgstr "90"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr "180"
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr "270"
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Barcode Einstellungen:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr "Element vorm verschieben und Größen Änderungen &schützen."
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 msgid "&Top:"
 msgstr "&Oben:"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 msgid "&Left:"
 msgstr "&Links:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 msgid "&Height:"
 msgstr "&Höhe:"
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 msgid "&Width:"
 msgstr "&Breite:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 msgid "&Load image from path"
 msgstr "Bild von Pfad &laden"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr "Bildpfad aus einem Ausdruck erstellen"
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 msgid "&Size"
 msgstr "&Größe"
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr "&Nichts"
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 msgid "S&cale"
 msgstr "S&kalierung"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 msgid "Mirror &Horizontaly"
 msgstr "&Horizontaler spiegeln"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 msgid "Mirror &Vertically"
 msgstr "&Vertikal spiegeln"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr "Bildformat nicht unterstützt für die Datei: %1"
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
-msgstr "JavaScript Programm ausführen um die sichtbarkeit dieses Elements zu bestimmen:"
+msgstr ""
+"JavaScript Programm ausführen um die sichtbarkeit dieses Elements zu "
+"bestimmen:"
 
 #: rectsettingsdlg.cpp:54 rectsettingsdlg.cpp:145
 msgid "Settings"
@@ -2012,55 +2029,61 @@ msgstr "Die folgenden Tabellen werden neu erstellt '"
 msgid "' and '"
 msgstr "' und '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Kann die Datenbank nicht erstellen "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr ""
 "<br>Sie können das Erstellen fortsetzen wenn die Datenbank bereits existiert."
 "</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "KBarcode konnte die benötigte Datenbank nicht erstellen. Bitte erstellen Sie "
 "sie manuell."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Tabelle erstellt "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " erfolgreich!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Kann keine Datenbank Verbindung aufbauen."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Die komplette Tabelle wird gelöscht: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Die folgenden Tabellen werden gelöscht: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr "Die Datei für den Import konnte nicht gefunden werden. Der Daten-Import wird übersprungen. Bitte prüfen Sie Ihre KBarcode installation."
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "SQL Import Fortschritt:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Kann die Datei mit den Label Definitionen nicht öffnen."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Kann den Befehl nicht ausführen:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2068,43 +2091,43 @@ msgstr ""
 "Die SQL Tabellen von KBarcode wurden seit der letzten Version geändert. "
 "KBarcode hat sie ohne Datenverlust aktualisiert."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Datenbank Verbindung erfolgreich aufgebaut"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Datenbank Einstellungen"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Benutzername :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Passwort :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Datenbank :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Host :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Treiber :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "&Automatisch nach dem Start mit Datenbank verbinden"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Einstellungen überprüfen"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>Sie müssen die Datenbank Einstellungen testen, bevor Sie fortfahren "
@@ -2128,7 +2151,9 @@ msgstr "Ein Datenfeld einfügen"
 
 #: tokendialog.cpp:68
 msgid "Insert a &custom SQL query, variable or JavaScript function"
-msgstr "Eine &benutzerspezifische SQL Abfrage, Variable oder JavaScript Funktion einfügen"
+msgstr ""
+"Eine &benutzerspezifische SQL Abfrage, Variable oder JavaScript Funktion "
+"einfügen"
 
 #: tokendialog.cpp:72
 msgid "Step 1 of 3"
@@ -2186,10 +2211,6 @@ msgstr "&Kommando:"
 msgid "Token"
 msgstr "Kommando"
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-msgid "Description"
-msgstr "Beschreibung"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr "&Benutzerspezifischer Ausdruck der in das Kommando eingefügt werden soll"
@@ -2199,7 +2220,10 @@ msgid ""
 "<qt>Certain tokens, like for exaple the sqlquery token need arguments. In "
 "the case of the sqlquery token, the sure has to enter a sql query in this "
 "text field.</qt>"
-msgstr "<qt>Bestimmte Kommandos, wie zum Beispiel das sqlquery Kommando, benötigen zusätzliche Argumente. Im Falle des des sqlquery Kommandos muss hier natürlich eine SQL Abfrage eingegeben werden.</qt>"
+msgstr ""
+"<qt>Bestimmte Kommandos, wie zum Beispiel das sqlquery Kommando, benötigen "
+"zusätzliche Argumente. Im Falle des des sqlquery Kommandos muss hier "
+"natürlich eine SQL Abfrage eingegeben werden.</qt>"
 
 #: tokendialog.cpp:191
 msgid "&Create a new custom variable"
@@ -2213,7 +2237,9 @@ msgstr "Eine existierende benutzerspezifische &Variable einfügen"
 msgid ""
 "<qt><b>No SQL connection found!</b><br>You can build a query, but you will "
 "not be able to execute or test it right now.<br></qt>"
-msgstr "<qt><b>Keine SQL Verbindung gefunden!</b><br>Sie können Ihre SQL Abfrage jetzt erstellen, können Sie aber weder testen noch ausführen.</br></qt>"
+msgstr ""
+"<qt><b>Keine SQL Verbindung gefunden!</b><br>Sie können Ihre SQL Abfrage "
+"jetzt erstellen, können Sie aber weder testen noch ausführen.</br></qt>"
 
 #: tokendialog.cpp:224
 msgid "&SQL Query:"
@@ -2467,7 +2493,7 @@ msgstr "Komplette E-Mail Addresse"
 msgid "Formatted Address"
 msgstr "Formattierte Addresse"
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr "Fehler: Lehre SQL Abfrage"
 
diff --git a/po/el.po b/po/el.po
index 7d94533..9ee9465 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2004-02-02 19:33+0200\n"
 "Last-Translator: Theodore Karkoulis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -28,45 +28,45 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Τύπος Κωδικοποίησης:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Τιμή:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "Εμ&φάνιση κειμένου"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Προχωρημένα..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Εισαγωγή &Πεδίου βάσης δεδομένων"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Περιθώριο:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Περιστροφή"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Μεγέθυνση (σε ):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Crop:"
@@ -83,64 +83,64 @@ msgstr "&Κατασκευή"
 msgid "&Print"
 msgstr "&Εκτύπωση"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Υπήρξε κάποιο σφάλμα κατά την αποθήκευση της εικόνας"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Ρυθμίσεις Barcode"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr ""
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr ""
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr ""
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr ""
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Πλάτος Τομέα (χιλ):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Ύψος (σε mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Μετάφραση escape sequences"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Κείμενο πάνω από το barcode"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Αυτόματη διόρθωση"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "&Μέθοδος υπολογισμού checksum:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -149,146 +149,146 @@ msgstr ""
 "της οδηγίες χρήσης του tbarcode για πληροφορίες. Κανονικά δεν θα θέλετε να "
 "αλλάξετε αυτή την τιμή.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Χωρίς Checksum"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Προεπιλεγμένη μέθοδος Checksum"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr ""
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Τομέας 43 (συνιστώμενος για το Code39 και Logmars, 1 ψηφίο)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Τομέας 47 ( 2 ψηφία)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr ""
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr ""
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 ψηφίο)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 ψηφία)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Ταχυδρομικό δίκτυο"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 ψήφιο)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 ψήφια)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr ""
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr ""
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr ""
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr ""
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr ""
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr ""
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr ""
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr ""
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Γραμμές:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Στήλες:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Επίπεδο διόρθωσης λαθών:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Μέγεθος συμβόλων Data Matrix (γραμμές x στήλες):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Αυτόματος υπολογισμός"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Ενεργοποίηση ακολουθίας"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Λουπάρισμα μεταξύ των αριθμών 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Λουπάρισμα μεταξύ των χαρακτήρων Α-Ω"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "Λουπάρισμα μεταξύ Α-Ω, 0-9"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Βήμα:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Αρχή:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Χρώμα περιγράμματος:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Χρώμα περιγράμματος:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "Χρώμα &Κειμένου..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Χωρίς Checksum"
@@ -307,7 +307,7 @@ msgstr "Μορφοποίηση Εξαγόμενου Αρχείου:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Όνομα Αρχείου"
@@ -332,152 +332,94 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Νέο Barcode"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 msgid " [PDF 417]"
 msgstr ""
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "Νέο Barcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "Νέο Barcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr ""
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr ""
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 msgid "Codabar (no checksum)"
 msgstr ""
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: αυτόματη επιλογή)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, εκτυπώσιμο ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (ψηφία compact τύπου)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr ""
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr ""
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr ""
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 ή EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "interleaved 2 of 5 (μόνο ψηφία, όχι checksum)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (μόνο ψηφία)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr ""
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr ""
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-ψήφιο EAN; UPCA και UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr ""
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-msgid "Code 11"
-msgstr ""
-
-#: barkode.cpp:733
-msgid "Code 2 of 5"
-msgstr ""
-
-#: barkode.cpp:737
-msgid "EAN 2"
-msgstr ""
-
-#: barkode.cpp:738
-msgid "EAN 5"
-msgstr ""
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "interleaved 2 of 5 (μόνο ψηφία)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Ταχυδρομικό δίκτυο"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-msgid "Royal Mail"
-msgstr ""
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-msgid "UPCA"
-msgstr ""
-
-#: barkode.cpp:750
-msgid "UPCE"
-msgstr ""
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Εκτύπωση..."
 
@@ -495,444 +437,420 @@ msgstr "Αρ. Αρθρου : "
 msgid "Creating Images..."
 msgstr "Δημιουργία εικόνων..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Περγραφή Άρθρου"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "&Εκτύπωση"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Εισαγωγή &Barcode"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 msgid "Delete Row"
 msgstr ""
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Εισαγωγή στον πίνακα:"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Αρχή:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Αριθμός Άρθρου"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Δημιουργία Εικόνων..."
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Επιλέξτε φάκελο εξόδου"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Μορφοποίηση Εξαγόμενου Αρχείου:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Χρησιμοποίηση &αριθμού άρθρου για όνομα αρχείου"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Χρησιμοποίηση αριθμού &barcode για όνομα αρχείου"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Χρησιμοποίηση &αριθμού άρθρου για όνομα αρχείου"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Όνομα Πελάτη και Αρ.:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "&Προχωρημένα..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "Ε&ισαγωγή"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "&Επεξεργαστής Ταμπέλων..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "Αφαίρεση &Ολων"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Εισαγωγή από αρχείο ..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Εισαγωγή από πρόχειρο ..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Εισαγωγή barcode_basic"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Εισαγωγή"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Αριθμός Ταμπέλων"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Αριθμός Άρθρου"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Γκρούπ"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Παρακαλώ εισάγετε μια περιγραφή:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "Εισαγωγή από αρχείο ..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Τύπος Κωδικοποίησης:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Αριθμός Ταμπέλων:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Όνομα Αρχείου"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Όνομα Αρχείου"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "Το αρχείο %1 δεν υπάρχει."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Παρακαλώ εισάγετε μια σωστή τιμή ID άρθρου"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Ο διαχωριστής είναι άδειος. Παρακαλώ δώστε του μια τιμή."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Τα παρακάτω αντικείμενα δεν μπορούν να προστεθούν:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Αδυναμία εκτέλεσης εντολής:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Νεό Παραλληλόγραμο"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Νέα γραμμή"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Νέο Κείμενο"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Νέα γραμμή"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Νέο Barcode"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Υπάρχουν αυτή τη στιγμή %1 barcodes στη μνήμη cache."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Ρύθμιση KBarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "Ρυθμίσεις SQL"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Ρυθμίσεις Εκτυπώσεων"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Μεσαία Aνάλυση (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Υψηλή Ανάλυση (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Πάρα πολύ Υψηλή Ανάλυση (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Ανάλυση Εκτυπωτή:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Μορφοποίηση σελίδας προεπισκόπησης:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Διαχωριστής:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Χαρακτήρας αναφοράς:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "Χρησιμοποίηση αρ. ά&ρθρου πελάτη για εισαγωγή"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Μορφοποίηση Αρχείου:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Ποσότητα"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Επεξεργαστής ταμπέλων"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Δημιουργία νέας ταμπέλας κατά την εκκίνηση"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Πλέγμα:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Χρώμα πλέγματος:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Μορφοποίηση Ημερομηνίας:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Σε Νέο"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Σε Νέο Άρθρο"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Όχι αλλαγή γραμμής"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Αλλαγή γραμμής"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Εισαγωγή Ταμπέλας Χ"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Νέα Σελίδα"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Αρ. Άρθρου"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Όνομα Γκρούπ"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Σε Νέο Γκρούπ"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr ""
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr ""
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Μέγεθος cache Barcode:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Καθαρισμός"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Ορίζει πόσα barcodes θα πρέπει να βρίσκονται στη μνήμη cache του σκληρού "
-"δίσκου. Εάν εκτυπώνετε πολλά άρθρα, θα πρέπει να ορίσετε την τιμή αυτή ως "
-"την ίδια με τον αριθμό των άρθρων στη δάση δεδομένων προκειμένου να έχετε τη "
-"μέγιστη ταχύτητα. Ένα αποθηκευμένο barcode απαιτεί περίπου 20kb "
-"αποθηκευτικού χώρου</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Εισαγωγή Διεύθυνσης"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Προεπισκόπηση: "
 
@@ -988,7 +906,7 @@ msgstr ""
 "<br>Το KBarcode θα προσθέσει επίσης κάποιoυς Ορισμούς Πινάκων στους πίνακες."
 "<br>Μετά από αυτό θα γεμίσετε τους πίνακες με μερικά παραδείγματα."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "Δημιουργία &Πινάκων"
 
@@ -1000,7 +918,7 @@ msgstr "Προσ&θήκη Δεδομένων Παραδειγμάτων"
 msgid "Create Tables"
 msgstr "Δημιουργία Πινάκων"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Η σύνδεση απέτυχε</qt>"
 
@@ -1020,44 +938,102 @@ msgstr ""
 "οδηγοί είναι μέρος του κώδικα του QT και θα πρέπει να επίσης να αποτελούν "
 "και μέρος του συστήματός σας. Παρακαλώ εγκαταστήστε τους πρώτα."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "Ε&ισαγωγή"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Εισαγωγή επιλεγμένου αρχείου στους πίνακες."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "Εισαγωγή Δεδομένων &Παραδειγμάτων"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Αλλαγή Ταμπέλας..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Στήλη:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Σετ"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Πεδίο βάσης δεδομένων για χρησιμοποίηση με αυτή τη στήλη:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Αρχείο για εισαγωγή:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Τύπος Κωδικοποίησης:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Εισαγωγή στον πίνακα:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Όνομα Αρχείου"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Ρυθμίσεις Εκτυπώσεων"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Εισαγωγή Αρχείου CVS..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "Αφαίρεση &Ολων"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Αποτυχία εισαγωγής της γραμμής:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Τα δεδομένα εισήχθησαν με επιτυχία."
 
@@ -1129,8 +1105,8 @@ msgstr "Κάθετος Αριθμός:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr ""
 
@@ -1190,7 +1166,7 @@ msgstr "&Σειρά"
 msgid "&Fill Color"
 msgstr "Χρώμα γεμίσματος:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr ""
 
@@ -1204,7 +1180,7 @@ msgstr "Περιστροφή"
 msgid "&Text"
 msgstr "Νέο Κείμενο"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "...ως &Εικόνας"
@@ -1218,35 +1194,39 @@ msgstr ""
 msgid "Property changed"
 msgstr "Διαχειριστής Έργου"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Εκκίνηση Οδηγού Ρύθμισης..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Σύνδεση στη Βάση Δεδομένων"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "Εισαγωγή &Ορισμών Ταμπέλων"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "Εισαγωγή Δεδομένων &Παραδειγμάτων"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&Ελεγχος Συστήματος..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "&Βοήθεια KBarcode..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Δωρεές..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1254,11 +1234,11 @@ msgstr ""
 "<qt>Το εγχειρίδιο χρήσης του KBarcode βρίσκεται στην ηλεκτρονική σελίδα μας "
 "σε μορφή PDF.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Κατέβασμα Τώρα"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1266,25 +1246,25 @@ msgstr ""
 "<qt>Είναι δυνατόν να υποστηρίξετε την εξέλιξη του KBarcode μέσω δωρεών! Το "
 "σύστημα PayPal θα χρησιμοποιηθεί για την δωρεά σας.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Δωρεά Τώρα!"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Υποστήριξη KBarcode</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Οχι</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Βρέθηκε</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1292,15 +1272,15 @@ msgstr ""
 "<p>Για να έχετε<b>υποστήριξη barcode</b> θα πρέπει να εγκαταστήσετε το "
 "<i>GNU Barcode</i>, <i>TBarcode</i> ή το <i>PDF417 Enc</i>.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Υποστήριξη Βάσης δεδομένων</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Βρέθηκε Οδηγός: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1311,6 +1291,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Περιγραφή Ταμπέλας"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Δημιουργός Barcode..."
@@ -1343,182 +1344,182 @@ msgstr "&Επεξεργασία Πελατών"
 msgid "&Edit Customer Text"
 msgstr "&Επεξεργασία κειμένου Πελατών"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Στατικό"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Επιλογή Ταμπέλας"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Κλείσιμο &Ταμπέλας"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "&Πρόσφατα Αρχεία"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Εισαγωγή και Εκτύπωση Ομαδικού Αρχείου..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Αλλαγή περιγραφής..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Διαγραφή Αντικειμένου"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Δημιουργία εικόνων..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Αλλαγή Ταμπέλας..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Εισαγωγή &Barcode"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Εισαγωγή &Εικόνας"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Εισαγωγή &Κειμένου"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Εισαγωγή &Πεδίου βάσης δεδομένων"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Εισαγωγή &Κειμένου"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Εισαγωγή &Γραμμής"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Εισαγωγή &Παραλληλόγραμου"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Εισαγωγή &Έλλειψης"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Πλέγμα"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Προεπισκόπηση..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Βιβλίο &Διευθύνσεων"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Δημιουργία Απλού Barcode..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "Ε&ργαλεία"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "Στην &Κορυφή"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Ανύψωση"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Κατέβασμα"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Στο Φόντο"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Κεντράρισμα &Οριζόντια"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Κεντράρισμα &Κάθετα"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Σειρά"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Κέντρο"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Ιδιότητες"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Περιγραφή Ταμπέλας"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Παρακαλώ εισάγετε μια περιγραφή:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Μέγεθος: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Προσχέδιο Ταμπέλας: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 msgid "Protected Item"
 msgstr ""
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Ορθογραφικός Έλεγχος"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Το αρχείο %1 δεν υπάρχει."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Το έγγραφο έχει αλλάξει.<br><br>Θέλετε να το αποθηκεύσετε?</qt>"
@@ -1590,8 +1591,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr ""
+#, fuzzy
+msgid "KBarcode"
+msgstr "Νέο Barcode"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1720,10 +1722,6 @@ msgstr "Στοίχιση &Δεξια"
 msgid "&Justify"
 msgstr "&Πλήρης Στοίχιση"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Το barcode δεν είναι έγκυρο!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Θέση: "
@@ -1947,99 +1945,99 @@ msgstr "&Εκτύπωση περιγράμματος"
 msgid "Image Saved in KBarcode"
 msgstr ""
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Χρώμα:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Πλάτος γραμμής:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Στύλ γραμμής:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 msgid "90"
 msgstr ""
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Ρυθμίσεις Barcode:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "Στην &Κορυφή"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Αριστερό Κενό:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Υψος: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Πλάτος γραμμής:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Μη υποστηριζόμενη μορφή εικόνας"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Μέγεθος: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 msgid "S&cale"
 msgstr ""
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Κεντράρισμα &Οριζόντια"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Κεντράρισμα &Κάθετα"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2094,56 +2092,62 @@ msgstr "Πρόκειται να επανακατασκευάσουμε τους
 msgid "' and '"
 msgstr ""
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Αδυναμία δημιουργίας βάσης δεδομένων "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Μπορείτε να συνεχίσετε εαν η βάση δεδομένων υπάρχει ήδη.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "Το KBarcode δεν μπόρεσε να κατασκευάσει την απαιτούμενη βάση δεδομένων. "
 "Παρακαλώ κατασκευάστε την χειροκίνητα."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Δημιουργήθηκε ο πίνακας "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr "με επιτυχία!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Αδυναμία σύνδεσης με τη βάση δεδομένων."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Πρόκειται να διαγράψουμε τον ολοκληρωμένο πίνακα: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Πρόκειται να διαγράψουμε τους ολοκληρωμένους πίνακες: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "Πρόοδος εισαγωγής SQL:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr ""
 "Αδυναμία ανοίγματος του αρχείου δεδομένων που περιέχει τους ορισμούς "
 "ταμπέλων."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Αδυναμία εκτέλεσης εντολής:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2151,43 +2155,43 @@ msgstr ""
 "Οι SQL πίνακες του KBarcode άλλαξαν από την τελευταία έκδοση. Το KBarcode "
 "τους άλλαξε χωρίς καμία απώλεια δεδομένων."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Επιτυχία σύνδεσης με βάση δεδομένων"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Ρυθμίσεις βάσης δεδομένων"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Όνομα Χρήστη :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Κωδικός πρόσβασης :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Βάση δεδομένων :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Κεντρικός Υπολογιστής :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Οδηγός :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "&Αυτόματη σύνδεση κατά την εκκίνηση του προγράμματος"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Ελεγχος ρυθμίσεων"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>Πρέπει να ελέγξετε τις ρυθμίσεις της βάσης δεδομένων πρίν προχωρήσετε.</b>"
@@ -2272,11 +2276,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Περιγραφή Ταμπέλας"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2565,7 +2564,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2578,6 +2577,38 @@ msgstr ""
 "KBarcode.<br>Παρακαλώ ελέγξε οτι ο ορισμός ταμπέλας που χρησιμοποιείτε είναι "
 "σωστός:<br><b>"
 
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "interleaved 2 of 5 (μόνο ψηφία)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Ταχυδρομικό δίκτυο"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Μέγεθος cache Barcode:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Καθαρισμός"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Ορίζει πόσα barcodes θα πρέπει να βρίσκονται στη μνήμη cache του "
+#~ "σκληρού δίσκου. Εάν εκτυπώνετε πολλά άρθρα, θα πρέπει να ορίσετε την τιμή "
+#~ "αυτή ως την ίδια με τον αριθμό των άρθρων στη δάση δεδομένων προκειμένου "
+#~ "να έχετε τη μέγιστη ταχύτητα. Ένα αποθηκευμένο barcode απαιτεί περίπου "
+#~ "20kb αποθηκευτικού χώρου</qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Εισαγωγή Διεύθυνσης"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Το barcode δεν είναι έγκυρο!"
+
 #~ msgid "&Invert colors"
 #~ msgstr "&Αντιστροφή χρωμάτων"
 
diff --git a/po/es.po b/po/es.po
index eb2537f..85a1244 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kbabel-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2003-11-08 16:04+0100\n"
 "Last-Translator: Miguel Revilla Rodríguez <[email protected]>\n"
 "Language-Team: Español <[email protected]>\n"
@@ -32,45 +32,45 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Tipo de codificación:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Valor:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Mostrar texto"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Avanzado..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Insertar campo de la base de &datos"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Margen:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Rotación:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Escala (en promillas):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Recorte:"
@@ -87,64 +87,64 @@ msgstr "&Generar"
 msgid "&Print"
 msgstr "Im&primir"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Ocurrió un error al guardar la imagen"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Preferencias de códigos de barras"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Colores"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Secuencia"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Ancho del módulo (en mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Alto (en mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Traducir secuencias de escape"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Texto sobre el código de barras"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "Corrección &automática"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "Método de cálculo de suma de &comprobación:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -152,146 +152,146 @@ msgstr ""
 "<qt>Cambiar el módulo utilizado por tbarcode. Cosulte la documentación de "
 "tbarcode para más detalles. Normalmente no se debe cambiar este valor.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Sin suma de comprobación"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Método de suma de comprobación"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Suma de comprobación módulo 10"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Módulo 43 (sugerido por Code39 y Logmars, 1 dígito)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Módulo 47 (2 dígitos)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 dígito)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 dígitos)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 dígito)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 dígitos)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Filas:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Columnas:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Nivel de corrección de error:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Tamaños de símbolos de matriz de datos (filas x columnas):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Cálculo automático"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Activar secuencia"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Iterar sobre los números 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Iterar sobre los caracteres A-Z"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "Iterar sobre A-Z, 0-9"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Paso:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Inicio:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Color del borde:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Color del borde:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "&Color del texto..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Sin suma de comprobación"
@@ -310,7 +310,7 @@ msgstr "Formato del archivo de salida:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Nombre del archivo"
@@ -335,161 +335,96 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Nuevo código de barras"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 #, fuzzy
 msgid " [PDF 417]"
 msgstr "PDF417"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "TBarcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "TBarcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Code 128 en bruto"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (sin dígito de control)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: autoselección)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, ascii imprimible"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (dígitos compactos)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (sin dígito de control)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 o EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "2 de 5 interpolado (sólo dígitos, sin dígito de control)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "2 de 5 interpolado (sólo dígitos)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (aún en EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (EAN de 12 dígitos; UPCA y UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "Código de barras pdf 417 2D"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Code 128"
-
-#: barkode.cpp:737
-#, fuzzy
-msgid "EAN 2"
-msgstr "EAN 128"
-
-#: barkode.cpp:738
-#, fuzzy
-msgid "EAN 5"
-msgstr "EAN 8"
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "2 de 5 interpolado (sólo dígitos)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-#, fuzzy
-msgid "Royal Mail"
-msgstr "Royal Mail 4 State"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-#, fuzzy
-msgid "UPCA"
-msgstr "UPC A"
-
-#: barkode.cpp:750
-#, fuzzy
-msgid "UPCE"
-msgstr "UPC E"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Imprimiendo..."
 
@@ -507,449 +442,425 @@ msgstr "Artículo nº : "
 msgid "Creating Images..."
 msgstr "Creando imágenes..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 #, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Este asistente le guiará a través del proceso de configuración de "
 "una base de datos para su uso con kbarcode. Si no desea utilizar ninguna "
 "función de base de datos de kbarcode, puede obviar este asistente.</qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Descripción del artículo"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Calidad de impresión"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Insertar código de &barras"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Eliminar elemento"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Importar en la tabla:"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Inicio:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Número de artículo"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Creando imágenes..."
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Seleccionar directorio de salida"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Formato del archivo de salida:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Utilizar número de &artículo para el nombre del archivo"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Utilizar número del código de &barras para el nombre del archivo"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Utilizar número de &artículo para el nombre del archivo"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Nombre y número del cliente:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "&Avanzado..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importar"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "&Editor de etiquetas..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "&Eliminar todos"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Importar desde archivo..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Importar desde el portapapeles..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Importar barcode_basic"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Índice"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Número de etiquetas"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Número de artículo"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Grupo"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Por favor, introduzca una descripción:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "Importar desde archivo..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Tipo de codificación:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Número de etiquetas:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Nombre del archivo"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Nombre del archivo"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "El archivo %1 no existe."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Introduzca un ID de artículo válido"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "El separador está vacío. Por favor, dele un valor."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Lo siguientes elementos no se pueden añadir:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>No se puede ejecutar el comando:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Nuevo rectángulo"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Nueva línea"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Nuevo texto"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Nueva línea"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Nuevo código de barras"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Hay %1 códigos de barras en caché."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Configurar KBarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "Preferencias de SQL"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Preferencias de impresión"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Resolución media (300ppp)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Resolución alta (600ppp)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Resolución muy alta (1200ppp)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Resolución de la impresora:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Formato de previsualización:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Separador:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Carácter de cita:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "&Utilizar número de artículo del cliente para importar"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Formato de archivo:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Cantidad"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Editor de etiquetas"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Crear una nueva etiqueta al comenzar"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Rejilla:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Color de la rejilla:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Formato de fecha:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "En nuevo"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "En artículo nuevo"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Sin salto de línea"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Salto de línea"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Insertar etiqueta X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Nueva página"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Artículo nº"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Nombre del grupo"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "En grupo nuevo"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Código de barras"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Caché de código de barras"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Tamaño de caché de código de barras:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Limpiar"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Especifica el número de códigos de barras que deben permanecer en caché "
-"en el disco duro. Si imprime muchos artículos, debería establecer el tamaño "
-"de la caché al número de artículos de la base de datos, para obtener los "
-"mejores resultados. Un código de barras en la caché ocupa unos 20KB de "
-"espacio en disco.</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Importación de direcciones"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Previsualización: "
 
@@ -1007,7 +918,7 @@ msgstr ""
 "añadirá también algunas definiciones de etiquetas a las tablas.<br>Después "
 "usted podrá rellenar las tablas con alguna información de ejemplo."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Crear tablas"
 
@@ -1019,7 +930,7 @@ msgstr "&Añadir información de ejemplo"
 msgid "Create Tables"
 msgstr "Crear tablas"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Conexión fallida:<br>"
 
@@ -1040,44 +951,102 @@ msgstr ""
 "deberían también formar parte de la distribución de su sistema operativo. "
 "Por favor, instale los controladores antes de continuar."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importar"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Importar el archivo seleccionado en las tablas."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Importar información de ejemplo"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Cambiar etiqueta..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Columna:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Establecer"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Campo de la base de datos para esta columna:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Archivo a importar:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Tipo de codificación:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Importar en la tabla:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Nombre del archivo"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Preferencias de impresión"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Importar archivo CSV..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "&Eliminar todos"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "No se puede importar la siguiente línea:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Información importada correctamente."
 
@@ -1150,8 +1119,8 @@ msgstr "Número vertical:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1211,7 +1180,7 @@ msgstr "&Orden"
 msgid "&Fill Color"
 msgstr "Color de relleno:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "Código de &barras"
 
@@ -1225,7 +1194,7 @@ msgstr "Rotación:"
 msgid "&Text"
 msgstr "Texto:"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "...como &imagen"
@@ -1239,35 +1208,39 @@ msgstr ""
 msgid "Property changed"
 msgstr "Administrador del proyecto"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Iniciar asistente de configuración..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Conectar a la base de datos"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Importar definiciones de etiquetas"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Importar información de ejemplo"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "Comprobación del &sistema..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "Ayuda de &Barcode..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Donativos..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1275,11 +1248,11 @@ msgstr ""
 "<qt>La documentación de KBarcode está disponible pasa su descarga en formato "
 "PDF en nuestra página web.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Descargar ahora"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1287,25 +1260,25 @@ msgstr ""
 "<qt>Es posible colaborar con el futuro desarrollo de KBarcode a través de "
 "donativos. Para procesar el donativo se utilizará PayPal.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Donar ahora"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Soporte para códigos de barras</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>No</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Encontrado</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1313,15 +1286,15 @@ msgstr ""
 "<p>Para tener <b>soporte para códigos de barras</b>, deberá instalar <i>GNU "
 "Barcode</i>, <i>TBarcode</i> o <i>PDF417 Enc</i>.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Soporte para base de datos</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Controlador encontrado: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1332,6 +1305,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Descripción de la etiqueta"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Generador de códigos de barras..."
@@ -1364,183 +1358,183 @@ msgstr "&Editar clientes"
 msgid "&Edit Customer Text"
 msgstr "&Editar texto de clientes"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Estático"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Seleccionar etiqueta"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Cerrar &etiqueta"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "Archivos &recientes"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Importar e imprimir archivo de lotes..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Cambiar descripción..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Eliminar objeto"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Creando imágenes..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Cambiar etiqueta..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Insertar código de &barras"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Insertar &imagen"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Insertar &texto"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Insertar campo de la base de &datos"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Insertar &texto"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Insertar &línea"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Insertar &rectángulo"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Insertar &elipse"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Rejilla"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Previsualizar..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Li&bro de direcciones"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Crear código de barras único..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "&Herramientas"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Al primer plano"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Subir"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Bajar"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "Al &fondo"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Centrar &horizontalmente"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Centrar &verticalmente"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Orden"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Centrar"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Propiedades"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Descripción de la etiqueta"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Por favor, introduzca una descripción:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Plantilla de la etiqueta: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 #, fuzzy
 msgid "Protected Item"
 msgstr "Elemento movido"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Revisar ortografía"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "El archivo %1 no existe."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>El documento ha sido modificado.<br><br>¿Desea guardarlo?</qt>"
@@ -1612,8 +1606,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Código de barras"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1743,10 +1738,6 @@ msgstr "Alinear a la &derecha"
 msgid "&Justify"
 msgstr "&Justificar"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Código de barras no válido."
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Posición: "
@@ -1971,101 +1962,101 @@ msgstr "Im&primir marcas de corte (bordes)"
 msgid "Image Saved in KBarcode"
 msgstr "Código de barras cambiado"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Color:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Ancho de línea:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Estilo de línea:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Preferencias del código de barras:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&Al primer plano"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Espacio izquierdo:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Alto: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Ancho de línea:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Formato de imagen no soportado"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Tamaño: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 #, fuzzy
 msgid "S&cale"
 msgstr "Escala:"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Centrar &horizontalmente"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Centrar &verticalmente"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2120,54 +2111,60 @@ msgstr "Se van a volver a crear las tablas '"
 msgid "' and '"
 msgstr "' y '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>No se puede crear la base de datos "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Puede continuar si la base de datos ya existe.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "KBarcode no puede crear la base de datos requerida. Por favor, hágalo "
 "manualmente."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Creada tabla "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " con éxito."
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "No se puede conectar a la base de datos."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Se va a eliminar por completo la tabla: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Se van a eliminar por completo las tablas: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "Progreso de importación SQL:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "No se puede abrir el archivo con las definiciones de las etiquetas."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>No se puede ejecutar el comando:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2175,43 +2172,43 @@ msgstr ""
 "Las tablas SQL de KBarcode han cambiado desde la última versión. KBarcode "
 "las ha actualizado sin ninguna pérdida de datos."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Conectado con éxito a la base de datos"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Preferencias de la base de datos"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Usuario :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Contraseña :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Base de datos :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Servidor :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Controlador :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "Conectar &automáticamente al iniciar el programa"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Probar preferencias"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>Debe probar las preferencias de la base de datos antes de continuar.</b>"
@@ -2297,11 +2294,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Descripción de la etiqueta"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2590,7 +2582,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2603,6 +2595,72 @@ msgstr ""
 "KBarcode.<br>Por favor, compruebe que la definición de la etiqueta es "
 "correcta:<br><b>"
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "EAN 2"
+#~ msgstr "EAN 128"
+
+#, fuzzy
+#~ msgid "EAN 5"
+#~ msgstr "EAN 8"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "2 de 5 interpolado (sólo dígitos)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Postnet"
+
+#, fuzzy
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail 4 State"
+
+#, fuzzy
+#~ msgid "UPCA"
+#~ msgstr "UPC A"
+
+#, fuzzy
+#~ msgid "UPCE"
+#~ msgstr "UPC E"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Caché de código de barras"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Tamaño de caché de código de barras:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Limpiar"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Especifica el número de códigos de barras que deben permanecer en "
+#~ "caché en el disco duro. Si imprime muchos artículos, debería establecer "
+#~ "el tamaño de la caché al número de artículos de la base de datos, para "
+#~ "obtener los mejores resultados. Un código de barras en la caché ocupa "
+#~ "unos 20KB de espacio en disco.</qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Importación de direcciones"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Código de barras no válido."
+
 #~ msgid "BarcodeCache"
 #~ msgstr "BarcodeCache"
 
@@ -2956,10 +3014,6 @@ msgstr ""
 #~ msgid "&Copy to Clipboard"
 #~ msgstr "&Copiar al portapapeles"
 
-#, fuzzy
-#~ msgid "&Import Data..."
-#~ msgstr "&Importar información de ejemplo"
-
 #~ msgid "Fit to Window"
 #~ msgstr "Ajustar a la ventana"
 
diff --git a/po/fi.po b/po/fi.po
index 3554d63..5cd0708 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Anton Vaaranmaa <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -27,45 +27,45 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Koodin tyyppi:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Arvo:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Näytä teksti"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "E&distynyt..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Lisää tietokannan kenttä"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Reunus:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Kierto:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Skaalaus (promilleissa):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Leikkaa yläreunasta:"
@@ -82,65 +82,65 @@ msgstr "&Muodosta"
 msgid "&Print"
 msgstr "T&ulosta"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Tapahtui virhe tallennettaessa kuvaa"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Viivakoodiasetukset"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 #, fuzzy
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Värit"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Jakso"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Moduulin leveys (millimetreissä):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Korkeus (millimetreissä):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr ""
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Teksti viivakoodin yläpuolella"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Automaattinen korjaus"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "&Tarkistussumman laskentamenetelmä:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -148,148 +148,148 @@ msgstr ""
 "<qt>Vaihda käytettävä moduuli. Tbarcoden dokumentaatiossa on tarkempia "
 "tietoja. Tavallisesti tätä arvoa ei tarvitse muuttaa.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Ei tarkistussummaa"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Oletusmenetelmä"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Modulo 10 tarkistussumma"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Module 43 (suositeltava Code39:lle ja Logmars:lle, 1 numero)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Modula 47 (2 numeroa)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 numero)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 numeroa)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 numero)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 numeroa)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 #, fuzzy
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Rivejä:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Sarakkeita:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Virheenkorjauksen taso:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Tietomatriisin symboolikot (rivit x sarakkeet):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Automaattinen laskenta"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 #, fuzzy
 msgid "&Enable sequence"
 msgstr "&Ota käyttöön jakso"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr ""
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Askel:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Aloitus:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Reunaviivan väri:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Reunaviivan väri:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "Tekstin &Väri..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Ei tarkistussummaa"
@@ -308,7 +308,7 @@ msgstr "Kohdetiedoston formaatti:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Tiedostonimi"
@@ -333,162 +333,97 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Uusi viivakoodi"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 #, fuzzy
 msgid " [PDF 417]"
 msgstr "PDF417"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "TBarcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "TBarcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raaka code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (ilman tarkistusnumeroa)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: automaattivalinta)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, tulostettava ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 #, fuzzy
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (ilman tarkistusnumeroa)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 tai EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "Lomitettu 2 5:stä (vain numeerinen, ei tarkistusnroa)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "Lomitettu 2 5:stä (vain numeerinen)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12:a numeron EAN; UPCA ja UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2D viivakoodi"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Code 128"
-
-#: barkode.cpp:737
-#, fuzzy
-msgid "EAN 2"
-msgstr "EAN 128"
-
-#: barkode.cpp:738
-#, fuzzy
-msgid "EAN 5"
-msgstr "EAN 8"
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "Lomitettu 2 5:stä (vain numeerinen)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-#, fuzzy
-msgid "Royal Mail"
-msgstr "Royal Mail 4 State"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-#, fuzzy
-msgid "UPCA"
-msgstr "UPC A"
-
-#: barkode.cpp:750
-#, fuzzy
-msgid "UPCE"
-msgstr "UPC E"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Tulostan..."
 
@@ -506,448 +441,425 @@ msgstr "Nimikenumero : "
 msgid "Creating Images..."
 msgstr "Luodaan kuvia..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 #, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Tämä ohjattu toiminto opastaa sinua ottamaan käyttöön tietokannan "
 "KBarcoden yhteyteen. Jos et halua hyödyntää tietokantaominaisuuksia voit "
 "hypätä tämän vaiheen yli.</qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Nimikkeen kuvaus"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Kirjoittimen tarkkuus"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Lisää &viivakoodi"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Tuhoa objekti"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Tuo tauluun: "
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Aloitus:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Nimikenumero"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Luo kuvia"
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Valitse kohdehakemisto"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Kohdetiedoston formaatti:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Käytä nimikenumeroa tiedostonimenä"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Käytä viivakoodin numeroa tiedostonimenä"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Käytä nimikenumeroa tiedostonimenä"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Asiakkaan nimi ja numero:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "E&distynyt..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Tuo"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "Etikettie&ditori..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "P&oista kaikki"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "&Tuo tiedostosta..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Tuo leikepöydästä..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Tuo barcode_basic"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Indeksi"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Etikettien lukumäärä"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Nimikenumero"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Ryhmä"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Määrittele kuvaus:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "&Tuo tiedostosta..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Koodin tyyppi:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Etikettien lukumäärä:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Tiedostonimi"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Tiedostonimi"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "Tiedostoa %1 ei ole olemassa."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Anna jokin käypä nimikenumero"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Erotin on tyhjä. Anna sille jokin arvo."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Seuraavia tietueita ei voitu lisätä:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Komentoa ei voitu suorittaa:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Uusi nelikulmio"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Uusi rivi"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Uusi teksti"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Uusi rivi"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Uusi viivakoodi"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Välimuistissa on tällä hetkellä %1 viivakoodia"
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Aseta Kbarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "SQL asetuket"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Tulostusasetukset"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Keskiverto tarkkuus (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Korkea tarkkuus (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Korkea tarkkuus (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Kirjoittimen tarkkuus:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Esikatsele sivun muoto:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Erotin:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Lainausmerkin merkki:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "&Käytä asiakkaan nimikettä tuontiin"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Tietojen asettelu:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Määrä"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Etikettie&ditori"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Luo uusi etiketti etikettieditoria käynnistettäessä"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Ruudukko:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Ruudukon väri:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Päiväyksen muoto:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Uusi"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Uudelle nimikkeelle"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Ei rivinvaihtoa"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Rivinvaihto"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Lisää etiketti X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Uusi sivu"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Nimikenumero"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Uudelle ryhmälle"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Viivakoodi"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Viivakoodin välimuisti"
-
-#: configdialog.cpp:321
-#, fuzzy
-msgid "Barcode Cache Size:"
-msgstr "Viivakoodin välimuistin koko:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Tyhjennä"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Määrittelee kuinka monta viivakoodia tulee tallentaa  kiintolevylle "
-"välimuistiin. Jos tulostat ison määrän nimikkeitä on suositeltavaa, että "
-"asetat arvon samaksi kuin tietokannassasi olevan nimikkeiden lukumäärän.</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Osoitteiden tuonti"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Esikatselu: "
 
@@ -1004,7 +916,7 @@ msgstr ""
 "KBarcode lisää myös valmiita etikettimäärittelyjä tietokantatauluihin."
 "<br>Tämän jälkeen voit täyttää taulut omilla tiedoillasi."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Luo tietokantatauluja"
 
@@ -1016,7 +928,7 @@ msgstr "&Lisää esimerkkitietoja"
 msgid "Create Tables"
 msgstr "Luo tietokantatauluja"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Yhteys epäonnistui:<br>"
 
@@ -1036,44 +948,102 @@ msgstr ""
 "toimitetaan osana QT-kirjaston lähdekoodia. Sopiva ajuri pitäisi löytyä myös "
 "sinun jakelustasi. Ole hyvä ja asenna jokin ajuri."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Tuo"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Tuo valitsemasi tiedoston tiedot tietokantatauluihisi."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Tuo esimerkkitietoja"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Vaihda etiketti..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Sarake:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Aseta"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Tietokannan kenttä käytettäväksi tähän sarakkeeseen:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Tiedosto joka tuodaan:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Koodin tyyppi:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Tuo tauluun: "
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Tiedostonimi"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Tulostusasetukset"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Tuo CSV tiedosto..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "P&oista kaikki"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Seuraavaa riviä ei voitu tuoda:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Tiedot tuotiin onnistuneesti."
 
@@ -1145,8 +1115,8 @@ msgstr "Koko reunuksineen pystysuunnassa:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1206,7 +1176,7 @@ msgstr "&Järjestä"
 msgid "&Fill Color"
 msgstr "Täytön väri:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Viivakoodi"
 
@@ -1220,7 +1190,7 @@ msgstr "Kierto:"
 msgid "&Text"
 msgstr "Teksti:"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "...&Kuvana"
@@ -1234,35 +1204,39 @@ msgstr ""
 msgid "Property changed"
 msgstr "Projektipäällikkö"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Käynnistä asetusten ohjattu toiminto..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Yhdistä tietokantaan"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Tuo etikettien määritelmiä"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Tuo esimerkkitietoja"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&Järjestelmän tarkistus..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "&Tietoja viivakoodeista..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Lahjoita..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1270,11 +1244,11 @@ msgstr ""
 "<qt>KBarcoden dokumentaatio on saatavana kotisivuiltamme PDF-tiedostona."
 "<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Lataa nyt"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1282,25 +1256,25 @@ msgstr ""
 "<qt>KBarcoden jatkoheitystä voi tukea rahalahjoitusten avulla. Lahjoitusten "
 "käsittelyssä käytetään PayPal-järjestelmää.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Lahjoita nyt"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Tuki viivakoodeille</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Ei tukea</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Kyllä</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1308,15 +1282,15 @@ msgstr ""
 "<p><b>Viivakoodituen </b> mahdollistamiseksi sinun täytyy asentaa joko "
 "<i>GNU Barcode</i>, <i>TBarcode</i> tai <i>PDF417 Enc</i>.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Tietokantatuki</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Ajuri löytyi: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1327,6 +1301,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Etiketin kuvaus"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Viivakoodikehitin..."
@@ -1359,184 +1354,184 @@ msgstr "&Muokkaa asiakkaita"
 msgid "&Edit Customer Text"
 msgstr "&Muokkaa asiakkaiden tekstejä"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Staattinen"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Valitse etiketti"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Sulje &etiketti"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "Avaa &vanha"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Tuo tietoja ja tulosta eräajona..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Muuta kuvausta..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Tuhoa objekti"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Luodaan kuvia..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Vaihda etiketti..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Lisää &viivakoodi"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Lisää &kuva"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Lisää &teksti"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Lisää tietokannan kenttä"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Lisää &teksti"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Lisää &rivi"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Lisää &nelikulmio"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Lisää &ellipsi"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Ruudukko"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Esikatselu..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Osoite&kirja"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Luo yksittäinen viivakoodi..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "T&yökalut"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Päällimmäisenä"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Nosta"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Laske"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Vie taustalle"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Keskitä &vaakasuunnassa"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Keskitä &pystysuunnassa"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Järjestä"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Keskitä"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Ominaisuudet"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Etiketin kuvaus"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Määrittele kuvaus:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Koko: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Etiketin mallipohja: "
 
 # fuzzyish
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 #, fuzzy
 msgid "Protected Item"
 msgstr "Siirretty objekti"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Oikoluku"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Tiedostoa %1 ei ole olemassa."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Asiakirjaa on muokattu.<br><br>Haluatko tallentaa sen?</qt>"
@@ -1609,8 +1604,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Viivakoodi"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1738,10 +1734,6 @@ msgstr "&Oikea tasaus"
 msgid "&Justify"
 msgstr "&Tasattu"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Viivakoodi on epäkelpo!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Sijainti: "
@@ -1967,101 +1959,101 @@ msgstr "&Tulosta reunat"
 msgid "Image Saved in KBarcode"
 msgstr "Muutettu viivakoodi"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Väri:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Viivan leveys:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Viivan tyyli:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Viivakoodiasetukset:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&Päällimmäisenä"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Vasen reunus:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Korkeus: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Viivan leveys:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Kuvaformaatti ei ole tuettu"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Koko: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 #, fuzzy
 msgid "S&cale"
 msgstr "Skaalus:"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Keskitä &vaakasuunnassa"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Keskitä &pystysuunnassa"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2116,54 +2108,60 @@ msgstr "Luodaan tietokantataulut uudelleen '"
 msgid "' and '"
 msgstr "' ja '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Tietokantaa ei voitu luoda "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Voit jatkaa mikäli tietokanta on jo olemassa.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "Kbarcode ei kyennyt luomaan vaadittavaa tietokantaa. Ole hyvä ja luo se "
 "manuaalisesti."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Tietokantataulu luotiin "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " onnistuneesti!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Tietokantaan ei saatu yhteyttä."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Koko tietokantataulu poistetaan: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Tietokantataulut poistetaan: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "SQL tuonnin edistyminen:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Ei voitu avata etikettien määritelmiä sisältävää datatiedostoa."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Komentoa ei voitu suorittaa:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2171,43 +2169,43 @@ msgstr ""
 "KBarcoden SQL-tietokantataulut ovat muuttuneet sitten edellisen version. "
 "KBarcode päivitti ne ilman tiedon hävikkiä."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Yhteydenotto tietokantaan onnistui"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Tietokanta-asetukset"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Käyttäjätunnus :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Salasana :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Tietokanta :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Palvelin :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Ajuri :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "&Yhdistä automaattisesti käynnistyksen yhteydessä"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Testaa asetuksia"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>Sinun täytyy testata tietokanta-asetuksiasi ennen kuin voit jatkaa.</b>"
@@ -2293,11 +2291,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Etiketin kuvaus"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2586,7 +2579,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2598,6 +2591,72 @@ msgstr ""
 "<qt>Tiedosto vaikuttaa olevan KBarcoden vanhemmalla versiolla luotu.Ole hyvä "
 "ja tarkista täsmääkö käytetty etiketin määritelmä:<br><b>"
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "EAN 2"
+#~ msgstr "EAN 128"
+
+#, fuzzy
+#~ msgid "EAN 5"
+#~ msgstr "EAN 8"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "Lomitettu 2 5:stä (vain numeerinen)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Postnet"
+
+#, fuzzy
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail 4 State"
+
+#, fuzzy
+#~ msgid "UPCA"
+#~ msgstr "UPC A"
+
+#, fuzzy
+#~ msgid "UPCE"
+#~ msgstr "UPC E"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Viivakoodin välimuisti"
+
+#, fuzzy
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Viivakoodin välimuistin koko:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Tyhjennä"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Määrittelee kuinka monta viivakoodia tulee tallentaa  kiintolevylle "
+#~ "välimuistiin. Jos tulostat ison määrän nimikkeitä on suositeltavaa, että "
+#~ "asetat arvon samaksi kuin tietokannassasi olevan nimikkeiden lukumäärän.</"
+#~ "qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Osoitteiden tuonti"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Viivakoodi on epäkelpo!"
+
 #~ msgid "BarcodeCache"
 #~ msgstr "BarcodeCache"
 
@@ -2954,10 +3013,6 @@ msgstr ""
 #~ msgid "&Copy to Clipboard"
 #~ msgstr "&Kopioi leikepöydälle"
 
-#, fuzzy
-#~ msgid "&Import Data..."
-#~ msgstr "&Tuo esimerkkitietoja"
-
 #~ msgid "Fit to Window"
 #~ msgstr "Sovita ikkunaan"
 
diff --git a/po/fr.po b/po/fr.po
index 6d19889..85b03b6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2006-06-30 20:01+0200\n"
 "Last-Translator: Raphaël Pinson <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -30,46 +30,46 @@ msgid ""
 "Your emails"
 msgstr "[email protected], [email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Type d'Encodage :"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Valeur :"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 #, fuzzy
 msgid "&Display text"
 msgstr "&Texte d'Affichage"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr ""
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Insérer Etiquette X"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Marge:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Rotation :"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Dimension (en permille):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Rogner:"
@@ -88,219 +88,222 @@ msgstr "&Générer code-barre"
 msgid "&Print"
 msgstr "&Imprimer"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Une erreur est survenue lors de la sauvegarde"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Propriété du Code barre"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr ""
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr ""
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 #, fuzzy
 msgid "TBarcode"
 msgstr "Code-&Barre"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 #, fuzzy
 msgid "Colors"
 msgstr "Couleur du Quadrillage:"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr ""
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 #, fuzzy
 msgid "Module width (mm):"
 msgstr "Largeur (en mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Hauteur (en mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr ""
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 #, fuzzy
 msgid "&Text above barcode"
 msgstr "Enregi&strer code-barre"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "Auto-&correction"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "&Méthode de calcul de la somme de contrôle"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
-msgstr "<qt>Changer le module utilisé par tbarcode. Pour plus de détails, reportez-vous à la documentation de tbarcode. Vous ne devriez pas avoir à modifier cette valeur</qt>"
+msgstr ""
+"<qt>Changer le module utilisé par tbarcode. Pour plus de détails, reportez-"
+"vous à la documentation de tbarcode. Vous ne devriez pas avoir à modifier "
+"cette valeur</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Pas de somme de contrôle"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Méthode de somme de contrôle par défaut"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Somme de contrôle par modulo 10"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Modulo 43 (conseillé pour le Code39 et le Logmars, à 1 digit) "
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Modulo 47 (à 2 digits)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr ""
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr ""
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 #, fuzzy
 msgid "Code 11 (1 digit)"
 msgstr "Code 128C (chiffres compacts)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 #, fuzzy
 msgid "Code 11 (2 digits)"
 msgstr "Code 128C (chiffres compacts)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr ""
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr ""
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr ""
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr ""
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr ""
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr ""
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr ""
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr ""
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 #, fuzzy
 msgid "Code 128"
 msgstr "Raw code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr ""
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr ""
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 #, fuzzy
 msgid "Columns:"
 msgstr "Commentaire :"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 #, fuzzy
 msgid "Error correction level:"
 msgstr "Correction Y"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr ""
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr ""
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr ""
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr ""
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr ""
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 #, fuzzy
 msgid "Start:"
 msgstr "Statique"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Couleur du Quadrillage:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Couleur du Quadrillage:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "&Couleur Texte "
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 msgid "Enable &Checksum"
 msgstr ""
 
@@ -318,7 +321,7 @@ msgstr "Format du Fichier:"
 msgid "&Print to File"
 msgstr "&Imprimer dans un fichier"
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 msgid "&Filename:"
 msgstr "Nom de &fichier"
 
@@ -342,155 +345,95 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Nouveau Code-barre"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 msgid " [PDF 417]"
 msgstr ""
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "Code-&Barre"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "Code-&Barre"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raw code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (sans checksum)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: selection automatique)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, ascii imprimable"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (chiffres compacts)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (sans checksum)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 ou EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "intercalé 2 sur 5 (chiffres uniquement, sans checksum)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (chiffres uniquement)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (still EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-digit EAN; UPCA et UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr ""
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Raw code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Raw code 128"
-
-#: barkode.cpp:737
-msgid "EAN 2"
-msgstr ""
-
-#: barkode.cpp:738
-msgid "EAN 5"
-msgstr ""
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "interleaved 2 of 5 (chiffres uniquement)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "Position"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-msgid "Royal Mail"
-msgstr ""
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-msgid "UPCA"
-msgstr ""
-
-#: barkode.cpp:750
-msgid "UPCE"
-msgstr ""
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 #, fuzzy
 msgid "Printing..."
 msgstr "Impression..."
@@ -510,467 +453,451 @@ msgstr "Numéro d'Article"
 msgid "Creating Images..."
 msgstr "Création des images..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr "<qt>Impossible d'ouvrir le fichier ou le périphérique <b>%1</b></qt>"
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
+#, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Ce guide vous aidera a configurer votre base de données pour une "
-"utilisation avec KBarcode. Si vous ne souhaitez pas utiliser de "
-"base de données avec KBarcode, vous pouvez sauter cette étape. </qt>"
+"utilisation avec KBarcode. Si vous ne souhaitez pas utiliser de base de "
+"données avec KBarcode, vous pouvez sauter cette étape. </qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Description d'article"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr "Imprimer des étiquettes sans données"
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr "Imprimer des &articles depuis la base de données SQL de KBarcode."
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr "Importer des &variables et imprimer"
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr "Imprimer des &contacts depuis le carnet d'adresses"
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr "Source de données"
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Résolution de l'imprimante"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Insérer Code-&Barre"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Supprimer l'élément"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "&Importer et Imprimer Fichier"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
+#, fuzzy
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
-msgstr "<qt>KBarcode peut placer des numéros de série sur les étiquettes. Si vous n'avez pas besoin de cette fonctionalité, vous pouvez passer cette étape. <br>Le début du numéro de série est une valeur contenant au moins un chiffre. Ce chiffre est imcrémenté pour chaque étiquette imprimée</qt"
+"print out.</qt>"
+msgstr ""
+"<qt>KBarcode peut placer des numéros de série sur les étiquettes. Si vous "
+"n'avez pas besoin de cette fonctionalité, vous pouvez passer cette étape. "
+"<br>Le début du numéro de série est une valeur contenant au moins un "
+"chiffre. Ce chiffre est imcrémenté pour chaque étiquette imprimée</qt"
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 msgid "Serial start:"
 msgstr "Début de la série :"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr "Incrément de la série :"
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 msgid "Serial Number"
 msgstr "Numéro de série"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr "&Imprimer sur une imprimante système ou dans un fichier"
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Créer les Tables"
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Format du Fichier:"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Format du Fichier:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr ""
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr ""
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 msgid "Use &custom filename:"
 msgstr ""
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 #, fuzzy
 msgid "Customer name and no.:"
 msgstr "Nom et Numéro du Client :"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "A&jouter"
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importer Données Exemple"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "Editeur d'&Etiquette"
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 #, fuzzy
 msgid "R&emove All"
 msgstr "Supprim&er tout"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 #, fuzzy
 msgid "Import from File ..."
 msgstr "&Importer et Imprimer Fichier"
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 #, fuzzy
 msgid "Import from Clipboard ..."
 msgstr "&Copier vers Presse Papier"
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 #, fuzzy
 msgid "Import barcode_basic"
 msgstr "KBarcode"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 #, fuzzy
 msgid "Index"
 msgstr "Index"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Nombre d'Etiquettes"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Numéro d'article"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 #, fuzzy
 msgid "Group"
 msgstr "Groupe"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Veuillez entrer une description:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "&Importer et Imprimer Fichier"
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Type d'Encodage :"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Nombre d'Etiquettes:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
-msgid "Remove selected contacts from the list of contacts which will be printed."
+#: batchwizard.cpp:413
+msgid ""
+"Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Nom de fichier"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Nom de fichier"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "Le fichier %1 n'existe pas."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Veuillez fournir un identifiant d'article valide"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Séparateur est vide  veuillez lui donner une valeur."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Les objets suivants ne peuvent être ajouté"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Impossible d'executer la commande:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 #, fuzzy
 msgid "New Rectangle"
 msgstr "Nouvelle page"
 
-#: commands.cpp:450
+#: commands.cpp:448
 #, fuzzy
 msgid "New Line"
 msgstr "Nouvelle Etiquette"
 
-#: commands.cpp:460
+#: commands.cpp:458
 #, fuzzy
 msgid "New Text"
 msgstr "Nouveau texte"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Nouvelle Etiquette"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Nouveau Code-barre"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr ""
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Configurer KBarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 #, fuzzy
 msgid "SQL Settings"
 msgstr "Paramètres MySQL"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Imprimer Paramètres"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 #, fuzzy
 msgid "Medium Resolution (300dpi)"
 msgstr "Moyenne Résolution 300 ppp"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Haute Résolution 600 ppp"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 #, fuzzy
 msgid "Very High Resolution (1200dpi)"
 msgstr "Haute Résolution 600 ppp"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 #, fuzzy
 msgid "Printer Resolution:"
 msgstr "Résolution de l'imprimante"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 #, fuzzy
 msgid "Preview Page Format:"
 msgstr "Format du Fichier:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 #, fuzzy
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 #, fuzzy
 msgid "Separator:"
 msgstr "Séparateur : "
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Caractère de citation:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 #, fuzzy
 msgid "&Use customer article no. for import"
 msgstr "&Utiliser Numéro d'articles du client pour l'import"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Format du Fichier:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 #, fuzzy
 msgid "Quantity"
 msgstr "Quantité"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editeur d'&Etiquette"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 #, fuzzy
 msgid "&Create a new label on startup"
 msgstr "Dem&ander une nouvelle étiquette au démarrage de l'éditeur d'étiquette"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 #, fuzzy
 msgid "Grid:"
 msgstr "Quadrillage :"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Couleur du Quadrillage:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Format de la date:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "A la création"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "A la création d'un Article"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Pas de saut de ligne"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 #, fuzzy
 msgid "Line Break"
 msgstr "Saut de ligne"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Insérer Etiquette X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Nouvelle page"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Numéro d'article"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 #, fuzzy
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "A la création d'un groupe"
 
-#: configdialog.cpp:307
-#, fuzzy
-msgid "Barcode"
-msgstr "Code-&Barre"
-
-#: configdialog.cpp:312
-#, fuzzy
-msgid "Barcode Cache"
-msgstr "KBarcode"
-
-#: configdialog.cpp:321
-#, fuzzy
-msgid "Barcode Cache Size:"
-msgstr "Propriété du Code barre"
-
-#: configdialog.cpp:325
-#, fuzzy
-msgid "&Clear"
-msgstr "&Centré"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr ""
-
-#: configdialog.cpp:466
 #, fuzzy
 msgid "Preview: "
 msgstr "Aperçu "
@@ -1025,7 +952,7 @@ msgstr ""
 "ajoutera aussi des Définitions d'Étiquettes aux tables.<br> Vous pourrez "
 "ensuite remplir les tables avec quelques données d'exemple."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Créer les Tables"
 
@@ -1037,7 +964,7 @@ msgstr "&Ajouter Exemple de Données"
 msgid "Create Tables"
 msgstr "Créer les Tables"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>La Connexion a échoué :<br>"
 
@@ -1054,47 +981,105 @@ msgid ""
 msgstr ""
 "Il n'y a pas de pilote QT SQL installé. KBarcode a besoin de ces pilotes "
 "pour accéder aux différentes bases SQL. Ces pilotes font partie des paquets "
-"sources de QT et devraient être présents dans votre distribution. Veuillez les "
-"installer."
+"sources de QT et devraient être présents dans votre distribution. Veuillez "
+"les installer."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 #, fuzzy
 msgid "&Import"
 msgstr "&Importer Données Exemple"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Importer le fichier sélectionné dans les tables"
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Importer des données d'exemple"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Changer d'étiquette"
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Colonne :"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Régler"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Champ de base de données à utiliser pour cette colonne :"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Fichier à importer :"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 msgid "Encoding:"
 msgstr "Type d'encodage :"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Importer dans la table :"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Nom de fichier"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Imprimer Paramètres"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Importer le fichier du CVS..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "Supprim&er tout"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Impossible d'importer la ligne suivante :"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Les données ont été importées avec succès."
 
@@ -1164,8 +1149,8 @@ msgstr "Numéro vertical :"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 #, fuzzy
 msgid "0"
 msgstr "0"
@@ -1225,7 +1210,7 @@ msgstr "&Bordure"
 msgid "&Fill Color"
 msgstr "Couleur de remplissage :"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "Code-&barre"
 
@@ -1237,7 +1222,7 @@ msgstr "&Rotation :"
 msgid "&Text"
 msgstr "&Texte : "
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 msgid "&Image"
 msgstr "&Image"
 
@@ -1249,35 +1234,39 @@ msgstr "&Visibilité"
 msgid "Property changed"
 msgstr "Propriété modifiée"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Démarrer l'assistant de configuration"
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "Se &Connecter  à la base de données"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Importer des définitions d'étiquettes"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Importer des données d'exemple"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&Vérification du système"
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "Aide sur les code-&barre..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "Faire un &Don..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1369,197 +1358,208 @@ msgstr "&Editer les clients"
 msgid "&Edit Customer Text"
 msgstr "&Editer le texte des clients"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
+#, fuzzy
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
-msgstr "%1 n'est pas une un format d'export valid pour l'option --output. Les valeurs valides sont POSTSCRIPT, IMAGE et BARCODE."
+"IMAGE and BARCODE."
+msgstr ""
+"%1 n'est pas une un format d'export valid pour l'option --output. Les "
+"valeurs valides sont POSTSCRIPT, IMAGE et BARCODE."
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 #, fuzzy
 msgid "Static"
 msgstr "Statique"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Sélectionner une étiquette"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
-msgstr "<qt>Le fichier <b>%1</b> ne peut pas être chargé car la définition d'étiquette est manquante.</qt>"
+msgstr ""
+"<qt>Le fichier <b>%1</b> ne peut pas être chargé car la définition "
+"d'étiquette est manquante.</qt>"
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "&Fermer l'étiquette"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "Fichiers &récents"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Importer et imprimer le fichier"
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Changer la description..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Supprimer l'objet"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr "Imprimer sur une imprimante de codes-&barre"
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 msgid "Print to &Image..."
 msgstr "Imprimer dans une &image..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Changer d'étiquette"
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Insérer un code-&barre"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Insérer une &image"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Insérer du &texte"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 msgid "Insert &Data Field"
 msgstr "Insérer un champ de &données"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 msgid "Insert &Text Line"
 msgstr "Insérer une ligne de &texte"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Insérer une &ligne"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Insérer un &rectangle"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Insérer une &élipse"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Grille"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "A&perçu..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "&Répertoire"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Créer un code-barre individuel"
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "&Outils"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "À l'a&vant"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 #, fuzzy
 msgid "&Raise"
 msgstr "&Élever"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 #, fuzzy
 msgid "&Lower"
 msgstr "A&baisser"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "À l'&arrière"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Centrer &horizontalement"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Centrer &verticalement"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "Or&donner"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Centrer"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr "&Protéger la position et la taille"
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 #, fuzzy
 msgid "&Properties"
 msgstr "&Propriétés"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Description de l'étiquette"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Entrez une description :"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Taille : "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Modèle d'étiquette: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 msgid "Protected Item"
 msgstr "Elément protégé"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Vérification orthographique"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Le fichier %1 n'existe pas."
 
-#: labeleditor.cpp:1054
-msgid "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
+#: labeleditor.cpp:1050
+msgid ""
+"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Le document a été modifié<br><br> Voulez-vous l'enregistrer ?</qt>"
 
 #: main.cpp:35
 msgid ""
 "Load the file in KBarcode (if --batch is specified, the file will be used in "
 "batchprinting mode)"
-msgstr "Charger le fichier dans KBarcode (si l'option --batch est spécifiée, le fichier sera utilisé en mode impression de groupe)"
+msgstr ""
+"Charger le fichier dans KBarcode (si l'option --batch est spécifiée, le "
+"fichier sera utilisé en mode impression de groupe)"
 
 #: main.cpp:36
 msgid ""
 "Print any loaded files immediately on the default printer or on the printer "
 "specified by the --printer commandline option and exit afterwards"
-msgstr "Imprimer immédiatement tout fichier chargé sur l'imprimante par défaut ou l'imprimante spécifiée par l'option --printer de la ligne de commande, et quitte ensuite."
+msgstr ""
+"Imprimer immédiatement tout fichier chargé sur l'imprimante par défaut ou "
+"l'imprimante spécifiée par l'option --printer de la ligne de commande, et "
+"quitte ensuite."
 
 #: main.cpp:38
 #, fuzzy
@@ -1613,8 +1613,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "KBarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Code-&Barre"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1749,10 +1750,6 @@ msgstr "Aligner à &droite"
 msgid "&Justify"
 msgstr "&Justifier"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Code barre non valide!"
-
 #: mycanvasview.cpp:152
 #, fuzzy
 msgid "Position: "
@@ -1979,94 +1976,94 @@ msgstr ""
 msgid "Image Saved in KBarcode"
 msgstr "Code-barre modifié"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 #, fuzzy
 msgid "Color:"
 msgstr "Couleur du Quadrillage:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr ""
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr ""
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 #, fuzzy
 msgid "Barcode Settings:"
 msgstr "Propriété du Code barre"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 msgid "&Top:"
 msgstr "&Haut :"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 msgid "&Left:"
 msgstr "&Gauche :"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 msgid "&Height:"
 msgstr "&Hauteur :"
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 msgid "&Width:"
 msgstr "&Largeur :"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 msgid "&Load image from path"
 msgstr "&Charger l'image depuis le chemin"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr "&Lire le chemin de l'image à partir de l'expression"
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 msgid "&Size"
 msgstr "&Taille :"
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr "&Aucun"
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 msgid "S&cale"
 msgstr "A&juster"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 msgid "Mirror &Horizontaly"
 msgstr "Miroir &horizontal"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 msgid "Mirror &Vertically"
 msgstr "Miroir &vertical"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr "Format d'image non supporté pour le fichier : %1"
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr "Évaluer le code JavaScript pour définir la visibilité de cet élément :"
 
@@ -2124,102 +2121,111 @@ msgstr "Nous allons effacer la table: 'label_def'"
 msgid "' and '"
 msgstr ""
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Impossible de créer la base de données"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Vous pouvez continuer si la base de données existe déjà.</qt>"
 
-#: sqltables.cpp:178
-msgid "KBarcode could not create the required database. Please create it manually."
-msgstr "KBarcode n'a pas pu créer la base de données requise. Merci de la créer manuellement."
+#: sqltables.cpp:182
+msgid ""
+"KBarcode could not create the required database. Please create it manually."
+msgstr ""
+"KBarcode n'a pas pu créer la base de données requise. Merci de la créer "
+"manuellement."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Table Créée "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr "avec succès!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Impossible de ce connecter á la base de donnée"
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 #, fuzzy
 msgid "We are going to delete the complete table: "
 msgstr "Nous allons effacer la table: 'label_def'"
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 #, fuzzy
 msgid "We are going to delete the complete tables: "
 msgstr "Nous allons effacer la table: 'label_def'"
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr ""
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Impossible d'ouvrir le fichier contenant la définition des étiquettes."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Impossible d'executer la commande:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
 msgstr ""
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Connection á votre base de donnée réussie."
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 #, fuzzy
 msgid "Database Settings"
 msgstr "Propriété de l'Image"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 #, fuzzy
 msgid "Username :"
 msgstr "Nom d'utilisateur :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 #, fuzzy
 msgid "Password :"
 msgstr "Mot de passe :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 #, fuzzy
 msgid "Database :"
 msgstr "Base de données:"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 #, fuzzy
 msgid "Host :"
 msgstr "Serveur:"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 #, fuzzy
 msgid "Driver :"
 msgstr "Pilote:"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 #, fuzzy
 msgid "&Autoconnect on program start"
 msgstr "Connection &Automatique au démarage"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Tester les paramètres"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 #, fuzzy
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr "Configurez vos paramètres de base de donnée ici<br>"
@@ -2305,11 +2311,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Légende"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2596,7 +2597,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2606,3 +2607,36 @@ msgid ""
 "<br>Please check if the used label definition is correct:<br><b>"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Raw code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Raw code 128"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "interleaved 2 of 5 (chiffres uniquement)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "Position"
+
+#, fuzzy
+#~ msgid "Barcode Cache"
+#~ msgstr "KBarcode"
+
+#, fuzzy
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Propriété du Code barre"
+
+#, fuzzy
+#~ msgid "&Clear"
+#~ msgstr "&Centré"
+
+#~ msgid "Kbarcode"
+#~ msgstr "KBarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Code barre non valide!"
diff --git a/po/hu.po b/po/hu.po
index eceaa64..881f899 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2003-12-02 22:09+0100\n"
 "Last-Translator: Sandor Jager <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -31,45 +31,45 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Kódolás típusa:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Érték:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Szöveg megjelenítése az ábrán"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Haladó"
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "&Adatbázismező beszúrása"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Margó:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Elforgatás:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Méretarány (ezermil-ben):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Magasság:"
@@ -86,64 +86,64 @@ msgstr "&Generálás"
 msgid "&Print"
 msgstr "&Nyomtatás"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Hiba történt a kép mentése közben"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Vonalkód beállításai"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Színek"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Sorozat"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Címkeszélesség (mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Magasság (mm-ben):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "Escape szekvenciák fordí&tása"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "Szöveg a vonalkód fele&tt"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Auto korrekció"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "Ellenőrzőösszeg számító &eljárás:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -152,146 +152,146 @@ msgstr ""
 "a tbarcode dokumentációját. Általában elmondható, hogy nem kell ezt "
 "megváltoztatni.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Nincs ellenőrzőösszeg"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Alapértelmezett ellenőrzőösszeg számítási eljárás"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Modulo 10 ellenőrzőösszeg"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Module 43 (Code39 és Logmars címkékhez javasolt, 1 számjegy)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Modula 47 (2 számjegy)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 számjegy)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 számjegy)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 számjegy)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 számjegy)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Sorok:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Oszlopok:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Hibajavítási szint:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "DataMatrix szimbólum mérete (sor x oszlop):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Automatikus számítás"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Sorozat engedélyezése"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Léptetés 0-9 között"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Léptetés A-Z között"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "Léptetés A-Z és 0-9 között"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Lépésköz:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Kezdet:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Keretszín:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Keretszín:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "Szöveg&szín"
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Nincs ellenőrzőösszeg"
@@ -310,7 +310,7 @@ msgstr "Kimeneti fileformátum:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Filenév"
@@ -335,161 +335,96 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Új vonalkód beszúrása"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 #, fuzzy
 msgid " [PDF 417]"
 msgstr "PDF417"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "TBarcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "TBarcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raw code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (ellenőrzőösszeg nélkül)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: automatikusan)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, nyomtatható ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (ellenőrzőösszeg nélkül)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 vagy EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "összefésült 2 az 5-ből (csak számok, ellenőrzőösszeg nélkül)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "összefésült 2 az 5-ből (csak számok)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (még mindig EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-digit EAN; UPCA és UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2D vonalkód"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Code 128"
-
-#: barkode.cpp:737
-#, fuzzy
-msgid "EAN 2"
-msgstr "EAN 128"
-
-#: barkode.cpp:738
-#, fuzzy
-msgid "EAN 5"
-msgstr "EAN 8"
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "összefésült 2 az 5-ből (csak számok)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-#, fuzzy
-msgid "Royal Mail"
-msgstr "Royal Mail 4 State"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-#, fuzzy
-msgid "UPCA"
-msgstr "UPC A"
-
-#: barkode.cpp:750
-#, fuzzy
-msgid "UPCE"
-msgstr "UPC E"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Nyomtatás folyamatban..."
 
@@ -507,448 +442,425 @@ msgstr "Cikkszám : "
 msgid "Creating Images..."
 msgstr "Képek készítése..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 #, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Ez a varázsló végigvezet az adatbázishoz történő kapcsolódás "
 "konfigurálásán. Amennyiben a programot adatbázis-támogatás nélkül szeretnéd "
 "használni, kihagyhatod ezt a varázslót.</qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Fejezetszám"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Nyomtatási minőség"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "&Vonalkód beszúrása"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Objetum törlése"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Importálás a táblába:"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Kezdet:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Cikkszám"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "Ké&pek létrehozása..."
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Célkönyvtárat kiválasztása"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Kimeneti fileformátum:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Cikk&szám használata filenévnek"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Vonal&kódszám használata filenévnek"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Cikk&szám használata filenévnek"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Ügyfél neve és száma:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "&Haladó"
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importálás"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "&Címkeszerkesztő..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "Ö&sszes eltávolítása"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Importálás fileból ..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Importálás vágólapról ..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Barcode_basic importálása"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Index"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Címkék száma"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Cikkszám"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Csoport"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Kérlek adj meg leírást:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "Importálás fileból ..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Kódolás típusa:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Címkék száma:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Filenév"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Filenév"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "A %1 fájl nem létezik."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Kérlek adj meg egy valós cikkszámok"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Üres szeparátor! Kérlek adj meg egy értéket!"
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>A következő elemeket nem lehet hozzáadni:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Nem hajtható végre a parancs:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Új négyszög"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Új vonal"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Új szöveg beszúrása"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Új vonal"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Új vonalkód beszúrása"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Jelenleg %1 vonalkód van a gyorstárban."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "KBarcode beállításai"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "SQL beállítások"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Nyomtatási beállítások"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Közepes felbontás (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Magas felbontás (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Nagyon magas felbontás (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Nyomtatási felbontás:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Előnézeti kép formátuma:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Szeparátor:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Aposztróf karakter:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "Ügyfél &cikkszámának használata importálásnál"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Fileformátum:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Címkeszerkesztő"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "Új címke készítésének &felajánlása induláskor"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Rajzrács mérete:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Rajzrács színe:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Dátumformátum:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Új nyomtatandó esetén..."
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Új cikknél..."
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Ne legyen sortörés"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Sortörés"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "X címke beszúrása"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Új oldal"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Cikkszám"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Csoport neve"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Új csoportnál..."
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Vonalkód"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Vonalkód gyorstár"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Vonalkód gyorstár mérete:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Törlés"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Megadja hogy hány vonalkód legyen a gyorstárban. Ha sok cikket "
-"nyomtatsz, akkor a legjobb sebesség eléréséhez célszerű ezt a cikkek "
-"számával megegyezőre értékre állítani. Minden gyorstárban tárolt vonalkód "
-"kb. 20kB tárterületet igényel.</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Cím importálása"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Előnézet:"
 
@@ -1003,7 +915,7 @@ msgstr ""
 "címkedefiníciót is hozzáad a táblákhoz. Ezután lehetőség van a táblákba "
 "történő példaadatok importálására."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "Táblák &létrehozása"
 
@@ -1015,7 +927,7 @@ msgstr "&Minta adatok hozzáadása"
 msgid "Create Tables"
 msgstr "Táblák létrehozása"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Kapcsolódási hiba:<br>"
 
@@ -1035,44 +947,102 @@ msgstr ""
 "valamint szerepelniük kell a te disztribúciódban is. Kérlek először ezeket "
 "telepítsd fel."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importálás"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "A kiválasztott file importálása a táblákba."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "Minta&adatok importálása"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Címke méretének megváltoztatása..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Oszlop:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Importálás"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Ehhez az oszlophoz használt adatbázismező:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Importálandó fájl:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Kódolás típusa:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Importálás a táblába:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Filenév"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Nyomtatási beállítások"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "CSV file &importálása..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "Ö&sszes eltávolítása"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "A következő sor importálása sikertelen volt:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Adatok sikeresen importálva."
 
@@ -1144,8 +1114,8 @@ msgstr "Címkék száma függőlegesen:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1205,7 +1175,7 @@ msgstr "&Sorrend"
 msgid "&Fill Color"
 msgstr "Kitöltési szín:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Vonalkód"
 
@@ -1219,7 +1189,7 @@ msgstr "Elforgatás:"
 msgid "&Text"
 msgstr "Szöveg:"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "... &képként"
@@ -1233,46 +1203,50 @@ msgstr ""
 msgid "Property changed"
 msgstr "Projektmenedzser"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Konfigurációs varázsló..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "Kapcsolódás az adat&bázishoz"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "Cí&mkedefiníciók importálása"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "Minta&adatok importálása"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&Rendszerellenőrzés..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "&Barcode Súgó..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Adományozás..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
 msgstr ""
 "<qt>A KBarcode dokumentációja PDF formátumban honlapunkon elérhető.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Letöltés most"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1281,25 +1255,25 @@ msgstr ""
 "támogatni, melyek a PayPal segítségével jutnak el rendeltetési helyükre."
 "<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Adományozás most"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Vonalkód támogatás</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Nem</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Talált</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1308,15 +1282,15 @@ msgstr ""
 "i>, vagy a <i>TBarcode</i> vagy a <i>PDF417 Enc</i> programok valamelyikét.</"
 "p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Adatbázis támogatás</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Megtalált illesztő: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1327,6 +1301,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Címke leírása"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "Vonalkód &Generátor..."
@@ -1359,183 +1354,183 @@ msgstr "Ü&gyfelek szerkesztése"
 msgid "&Edit Customer Text"
 msgstr "Ügy&fél megj. szerkesztése"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Állandó"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Címke kiválasztása"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "&Címke bezárása"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "Elő&zőleg megnyitott"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Importálás és nyomtatás nagy tételben..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Leírás megváltoztatása..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "Objetum &törlése"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Képek készítése..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Címke méretének megváltoztatása..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "&Vonalkód beszúrása"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "&Kép beszúrása"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "&Szöveg beszúrása"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "&Adatbázismező beszúrása"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "&Szöveg beszúrása"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "V&onal beszúrása"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "&Négyszög beszúrása"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "&Ellipszis beszúrása"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Rajzrács"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Előnézet..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "&Címjegyzék"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "Önálló vonalkód &készítése..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "Esz&közök"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Legfelül"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Megemelés"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Süllyesztés"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Háttérbe"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "&Vízszintesen középre"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "&Függőlegesen középre"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Sorrend"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Középre"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Tulajdonságok"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Címke leírása"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Kérlek adj meg leírást:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Méret: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Címke sablon: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 #, fuzzy
 msgid "Protected Item"
 msgstr "Objektum áthelyezve"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Helyesírásellenőrzés"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "A %1 fájl nem létezik."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>A dokumentum megváltozott.<br><br>Kívánod elmenteni ?</qt>"
@@ -1607,8 +1602,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Vonalkód"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1736,10 +1732,6 @@ msgstr "&Jobbra rendezés"
 msgid "&Justify"
 msgstr "&Sorkizárás"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Érvénytelen vonalkód!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Pozíció: "
@@ -1964,101 +1956,101 @@ msgstr "&Jelzővonalak nyomtatása (keretek):"
 msgid "Image Saved in KBarcode"
 msgstr "Vonalkód megváltoztatva"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Szín:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Vonalszélesség:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Vonalstílus:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Vonalkód beállításai:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&Legfelül"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Bal margó:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Magasság: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Vonalszélesség:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Nem támogatott képformátum"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Méret: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 #, fuzzy
 msgid "S&cale"
 msgstr "Méret:"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "&Vízszintesen középre"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "&Függőlegesen középre"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2113,54 +2105,60 @@ msgstr "A táblákat újból létre fogjuk hozni: '"
 msgid "' and '"
 msgstr "' és '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Nem lehet létrehozni az adatbázist "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Folytathatod, ha az adatbázis már létezik.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "A KBarcode nem tudta létrehozni a szükséges adatbázist. Kérlek hozd létre "
 "manuálisan."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Tábla sikeresen létrehozva: "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr ""
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Nem lehet csatlakozni az adatbázishoz."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Az egész táblát törölni fogjuk: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "A következő táblákat törölni fogjuk: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "SQL importálás állása:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Nem lehet megnyitni a címkedefiníciókat tartalmazó adatfájlt."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Nem hajtható végre a parancs:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2168,43 +2166,43 @@ msgstr ""
 "A KBarcode utolsó verziója óta az SQL táblák felépítése megváltozott, ezért "
 "most a KBarcode adatvesztés nélkül frissítette őket."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Sikeres kapcsolódás az adatbázishoz"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Adatbázis beállítások"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Felhasználói név :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Jelszó :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Adatbázis :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Kiszolgáló :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Illesztő :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "&Automatikus kapcsolódás a program indulásakor"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "Beállítások &tesztelése"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>A továbblépés előtt tesztelned kell az adatbázis-beállításaidat.</b>"
@@ -2290,11 +2288,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Címke leírása"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2583,7 +2576,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2595,6 +2588,71 @@ msgstr ""
 "<qt>Ezt a filet valószínűleg a KBarcode egy előző verziójával készítették."
 "<br>Kérlek ellenőrizd, hogy a címkedefiníció helyes-e:<br><b>"
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "EAN 2"
+#~ msgstr "EAN 128"
+
+#, fuzzy
+#~ msgid "EAN 5"
+#~ msgstr "EAN 8"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "összefésült 2 az 5-ből (csak számok)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Postnet"
+
+#, fuzzy
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail 4 State"
+
+#, fuzzy
+#~ msgid "UPCA"
+#~ msgstr "UPC A"
+
+#, fuzzy
+#~ msgid "UPCE"
+#~ msgstr "UPC E"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Vonalkód gyorstár"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Vonalkód gyorstár mérete:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Törlés"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Megadja hogy hány vonalkód legyen a gyorstárban. Ha sok cikket "
+#~ "nyomtatsz, akkor a legjobb sebesség eléréséhez célszerű ezt a cikkek "
+#~ "számával megegyezőre értékre állítani. Minden gyorstárban tárolt vonalkód "
+#~ "kb. 20kB tárterületet igényel.</qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Cím importálása"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Érvénytelen vonalkód!"
+
 #~ msgid "BarcodeCache"
 #~ msgstr "BarcodeCache"
 
@@ -2950,10 +3008,6 @@ msgstr ""
 #~ msgid "&Copy to Clipboard"
 #~ msgstr "Másolás vágóla&pra"
 
-#, fuzzy
-#~ msgid "&Import Data..."
-#~ msgstr "Minta&adatok importálása"
-
 #~ msgid "Fit to Window"
 #~ msgstr "Ablakmérethez igazítás"
 
diff --git a/po/it.po b/po/it.po
index 312e96c..79cbd6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2003-11-27 23:32+0100\n"
 "Last-Translator: Daniele Medri <[email protected]>\n"
 "Language-Team: italian <[email protected]>\n"
@@ -30,45 +30,45 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Tipo di codifica:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Valore:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Visualizza testo"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Avanzato..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Inserisci campo &database"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Margine:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Rotazione:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Scala (in permille):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Ritaglia:"
@@ -85,64 +85,64 @@ msgstr "&Genera"
 msgid "&Print"
 msgstr "&Stampa"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Si è verificato un errore durante il salvataggio dell'immagine"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Impostazioni codice a barre"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Colori"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Sequenza"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Modulo larghezza (mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Altezza (mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Traduci le sequenze di escape"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Testo sopra il codice a barre"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "Correzione &automatica"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "Metodo per il calcolo del &checksum:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -151,146 +151,146 @@ msgstr ""
 "documentazione di tbarcode per dettagli. Normalmente non dovresti cambiare "
 "questo valore.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Nessun checksum"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Metodo predefinito per il checksum"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Modulo 10 Checksum"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Module 43 (suggerita per Code39 e Logmars, 1 carattere)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Modula 47 (2 caratteri)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 digit)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 digits)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 carattere)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 caratteri)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Righe:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Colonne:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Livello della correzione di errore:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Dimensione della matrice dei dati per i simboli (righe x colonne)"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Calcolo automatico"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Abilita sequenza"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Itera sopra i numeri 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Itera sopra i caratteri A-Z"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "Itera sopra A-Z, 0-9"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Passo:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Inizio:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Colore bordo:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Colore bordo:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "&Colore del testo..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Nessun checksum"
@@ -309,7 +309,7 @@ msgstr "Formato file di uscita:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Nomefile"
@@ -334,161 +334,96 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Nuovo codice a barre"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 #, fuzzy
 msgid " [PDF 417]"
 msgstr "PDF417"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "TBarcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "TBarcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raw code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (no checksum)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: autoselection)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, full printable ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (no checksum)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 or EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "interleaved 2 of 5 (only digits, no checksum)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (only digits)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (still EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-digit EAN; UPCA and UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2D Barcode"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Code 128"
-
-#: barkode.cpp:737
-#, fuzzy
-msgid "EAN 2"
-msgstr "EAN 128"
-
-#: barkode.cpp:738
-#, fuzzy
-msgid "EAN 5"
-msgstr "EAN 8"
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "interleaved 2 of 5 (only digits)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-#, fuzzy
-msgid "Royal Mail"
-msgstr "Royal Mail 4 State"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-#, fuzzy
-msgid "UPCA"
-msgstr "UPC A"
-
-#: barkode.cpp:750
-#, fuzzy
-msgid "UPCE"
-msgstr "UPC E"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Stampa in corso..."
 
@@ -506,450 +441,426 @@ msgstr "Articolo N. :  "
 msgid "Creating Images..."
 msgstr "Creazione immagini..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 #, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Questo wizard ti guiderà attraverso il processo di configurazione "
 "del tuo database per utilizzarlo con kbarcode. Se non vuoi utilizzare le "
 "funzioni di accesso al database che kbarcode offre puoi uscire dal wizard.</"
 "qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Descrizione articolo"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Qualità di stampa"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Inserisci &codice a barre"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Elimina elemento"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Importa nella tabella:"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Inizio:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Numero articolo"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Crea immagini..."
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Seleziona la directory di output"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Formato file di uscita:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Utilizza il &numero dell'articolo per il nome file"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Utilizza il numero del codice a &barre per il nome file"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Utilizza il &numero dell'articolo per il nome file"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Nome e numero cliente:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "&Avanzato..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importa"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "Editor di e&tichetta..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "&Rimuovi tutto"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Importa da file..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Importa dagli appunti..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Importa barcode_basic"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Indice"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Numero di etichette"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Numero articolo"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Gruppo"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Per piascere, inserisci una descrizione:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "Importa da file..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Tipo di codifica:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Numero etichette:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Nomefile"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Nomefile"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "Il file %1 non esiste."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Per piacere, inserisci un ID valido per l'articolo"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Il separatore è vuoto. Per piacere imposta il valore."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Il seguente elemento non può essere aggiunto:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Impossibile eseguire il comando:<br></b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Nuovo rettangolo"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Nuova linea"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Nuovo testo"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Nuova linea"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Nuovo codice a barre"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Ci sono attualmente %1 codici a barre in cache."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Configura KBarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "Impostazioni SQL"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Impostazioni di stampa"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Risoluzione di stampa (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Alta risoluzione (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Alta risoluzione (1200 dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Risoluzione di stampa:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Anteprima formato file:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Commento:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Separatore:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Carattere di quoting:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "&Utilizza il numero dell'articolo cliente per l'importazione"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Formato file:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Quantità"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Editor di etichetta"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Crea una nuova etichetta all'avvio"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Griglia:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Colore griglia:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Formato data:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Con Nuovo"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Con Nuovo articolo"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Nessuna linea di interrunzione"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Interruzione di linea"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Inserisci etichetta X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Nuova pagina"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Articolo N."
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Nome gruppo"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Con Nuovo gruppo"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Codice a barre"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Cache del codice a barre"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Dimensione cache del codice a barre:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Pulisci"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Specifica quanti codici a barre dovresti tenere in cache sul disco "
-"fisso. Se stampi molti articoli, dovresti impostare questa per essere la "
-"stessa del numero di articoli nel tuo database per il massimo risultato in "
-"termini di velocità. Un codice a barre richiede circa 20kb di spazio disco.</"
-"qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Indirizzo di importazione"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Anteprima: "
 
@@ -1006,7 +917,7 @@ msgstr ""
 "anche alcune definizioni di etichette nelle tabelle.<br>Dopo queste "
 "operazioni, saranno aggiunti alcuni dati di esempio."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Crea tabelle"
 
@@ -1018,7 +929,7 @@ msgstr "&Aggiungi dati di esempio"
 msgid "Create Tables"
 msgstr "Crea tabelle"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt> Connessione fallita:<br>"
 
@@ -1038,44 +949,102 @@ msgstr ""
 "dovrebbero essere parte della tua distribuzione. Per piacere, installali per "
 "giovare della funzionalità."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importa"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Importa il file selezionato nelle tue etichette."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Importa dati di esempio"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Cambia etichetta..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Colonna:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Imposta"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Campo del database da utilizzare per questa colonna:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "File da importare:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Tipo di codifica:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Importa nella tabella:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Nomefile"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Impostazioni di stampa"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Importa file CSV..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "&Rimuovi tutto"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Non è possibile importare la seguente linea:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "I dati sono stati importati con successo."
 
@@ -1148,8 +1117,8 @@ msgstr "Numero verticale: "
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1209,7 +1178,7 @@ msgstr "&Ordine"
 msgid "&Fill Color"
 msgstr "Colore riempimento:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Barcode"
 
@@ -1223,7 +1192,7 @@ msgstr "Rotazione:"
 msgid "&Text"
 msgstr "Testo:"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "...come &Immagine"
@@ -1237,35 +1206,39 @@ msgstr ""
 msgid "Property changed"
 msgstr "Gestione progetto"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "&Avvio Wizard di configurazione..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Connetti al database"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Importa definizioni di etichetta"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Importa dati di esempio"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "Controlla &sistema..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "Guida sui codici a &barre..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Donate..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1273,11 +1246,11 @@ msgstr ""
 "<qt>La documentazione di KBarcode è disponibile in formato PDF sul nostro "
 "sito web. <br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Scarica ora"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1285,25 +1258,25 @@ msgstr ""
 "<qt>E' possibile supportare gli ulteriori sviluppi di KBarcode tramite "
 "donazioni. PayPal sarà utilizzato per il processo di donazioni.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Donate ora"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Supporto per codice a barre</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>No</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Trovato</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1311,15 +1284,15 @@ msgstr ""
 "<p>Per avere il <b>supporto per il codice a barre</b> devi installare sia "
 "<i>GNU Barcode</i>, <i>TBarcode</i> o <i>PDF417 Enc</i>.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Supporto per database</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Driver trovato: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1330,6 +1303,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Descrizione etichetta"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Generatore di codice a barre..."
@@ -1362,183 +1356,183 @@ msgstr "&Modifica clienti"
 msgid "&Edit Customer Text"
 msgstr "&Modifica testo personalizzato"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Statico"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Seleziona etichetta"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Chiudi etic&hetta"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "File &recenti"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&Importa e stampa file batch..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Cambia descrizione..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Elimina oggetto"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Creazione immagini..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Cambia etichetta..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Inserisci &codice a barre"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Inserisci &figura"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Inserisci &testo"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Inserisci campo &database"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Inserisci &testo"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Inserisci &linea"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Inserisci &rettangolo"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Inserisci &ellisse"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Griglia"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Anteprima..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Ru&brica"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Crea singolo codice a barre..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "St&rumenti"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&In alto"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Alza"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Abbassa"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Sullo sfondo"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Centra &orizzontalmente"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Centra &verticalmente"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Ordine"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Centra"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Proprietà"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Descrizione etichetta"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Per piascere, inserisci una descrizione:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Dimensione: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Modello di etichetta: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 #, fuzzy
 msgid "Protected Item"
 msgstr "Muovi elemento"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Controllo ortografico"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Il file %1 non esiste."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Il documento è stato modificato.<br><br>Desideri salvarlo?</qt>"
@@ -1610,8 +1604,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Codice a barre"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1739,10 +1734,6 @@ msgstr "Allinea a &destra"
 msgid "&Justify"
 msgstr "&Giustifica"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Codice a barre non valido!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Posizione: "
@@ -1967,101 +1958,101 @@ msgstr "&Stampa i segni di taglio (bordi)"
 msgid "Image Saved in KBarcode"
 msgstr "Codice a barre cambiato"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Colore:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Larghezza linea:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Stile linea:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Impostazioni codice a barre:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&In alto"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Sinistra:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br> Altezza: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Larghezza linea:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Formato immagine non supportato"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Dimensione: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 #, fuzzy
 msgid "S&cale"
 msgstr "Riscala:"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Centra &orizzontalmente"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Centra &verticalmente"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2116,56 +2107,62 @@ msgstr "Stiamo ricreando le tabelle '"
 msgid "' and '"
 msgstr "' e '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Impossibile creare il database "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Puoi continuare se il database esiste già.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 "KBarcode non può creare il database richiesto. Per piacere, crealo "
 "manualmente."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Tabella creata "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " successo!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Impossibile connettersi al database."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "stiamo per eliminare la tabella completa. "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Stiamo per eliminare le tabelle complete. "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "Avanzamento importazione SQL:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr ""
 "Impossibile aprire il file dei dati contenente le definizioni delle "
 "etichette."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Impossibile eseguire il comando:<br></b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2173,43 +2170,43 @@ msgstr ""
 "Le tabelle SQL di KBarcode sono cambiate dall'ultima versione. KBarcode "
 "aggiornerà queste senza perdita di dati."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Connesso con successo al tuo database"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Impostazioni database"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Nome utente:"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Password:"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Database:"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Host:"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Driver:"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "&Connessione automatica all'avvio"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "Impostazioni &testo"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr ""
 "<b>E' necessario controllare le impostazioni del database prima di procedere."
@@ -2296,11 +2293,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Descrizione etichetta"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2589,7 +2581,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2601,6 +2593,72 @@ msgstr ""
 "<qt>Questo file è stato creato da una vecchia versione di KBarcode. <br>Per "
 "piacere, controlla se l'etichetta utilizzata è corretta.<br><b>"
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "EAN 2"
+#~ msgstr "EAN 128"
+
+#, fuzzy
+#~ msgid "EAN 5"
+#~ msgstr "EAN 8"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "interleaved 2 of 5 (only digits)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Postnet"
+
+#, fuzzy
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail 4 State"
+
+#, fuzzy
+#~ msgid "UPCA"
+#~ msgstr "UPC A"
+
+#, fuzzy
+#~ msgid "UPCE"
+#~ msgstr "UPC E"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Cache del codice a barre"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Dimensione cache del codice a barre:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Pulisci"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Specifica quanti codici a barre dovresti tenere in cache sul disco "
+#~ "fisso. Se stampi molti articoli, dovresti impostare questa per essere la "
+#~ "stessa del numero di articoli nel tuo database per il massimo risultato "
+#~ "in termini di velocità. Un codice a barre richiede circa 20kb di spazio "
+#~ "disco.</qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Indirizzo di importazione"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Codice a barre non valido!"
+
 #~ msgid "BarcodeCache"
 #~ msgstr "BarcodeCache"
 
@@ -2941,10 +2999,6 @@ msgstr ""
 #~ msgid "&Copy to Clipboard"
 #~ msgstr "&Copia negli appunti"
 
-#, fuzzy
-#~ msgid "&Import Data..."
-#~ msgstr "&Importa dati di esempio"
-
 #~ msgid "Fit to Window"
 #~ msgstr "Adatta alla finestra"
 
diff --git a/po/pl.po b/po/pl.po
index 3e3fae6..e0f7d55 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2004-02-11 14:34+0100\n"
 "Last-Translator: Benedict P. Barszcz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -30,45 +30,45 @@ msgid ""
 "Your emails"
 msgstr "kb2qzv_@_poczta.wp.pl"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Rodzaj Kodowania"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Wartość:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Wyświetl tekst"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Zaawansowane..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Wstaw pole bazy &danych"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Margines:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Rotacja:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Skala (w permillach)"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Kadr:"
@@ -85,64 +85,64 @@ msgstr "&Generuj"
 msgid "&Print"
 msgstr "&Drukuj"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "wystąpił błąd podczas zapisywania obrazu"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Ustawienia Kodu"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Kolory"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Sekwencja"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Szerokość Modułu (mm)"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Wysokość (w mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Tłumacz sekwencje wyjścia"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Tekst ponad kodem"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Autopoprawka"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "Metoda kalkula&cji sumy kontrolnej:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -151,146 +151,146 @@ msgstr ""
 "dokumentacjitbarcode. Normalnie nie potrzebujesz tutaj zmieniać żadnej "
 "wartości<qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Bez sumy kontrolnej"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Domyślna metoda sumy kontrolnej"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Modulo 10 Checksum"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Modula 47 (2 cyfry)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 digit)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 cyfry)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 digit)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 cyfry)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Wiersze:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Kolumny:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Poziom sprawdzania błędów:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Wymiary symbolu Data Matrix (wiersze x kol):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Kalkulacja automatyczna"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Załącz sekwencje"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Przechodź przez numery 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Przechodź przez litery A-Z"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "Przechodź przez A-Z, 0-9"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Krok:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Start:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Kolor ramki:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Kolor ramki:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "&Kolor tekstu..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 #, fuzzy
 msgid "Enable &Checksum"
 msgstr "Bez sumy kontrolnej"
@@ -309,7 +309,7 @@ msgstr "Format pliku wyjściowego"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Nazwa pliku"
@@ -334,161 +334,96 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Nowy kod kreskowy"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 #, fuzzy
 msgid " [PDF 417]"
 msgstr "PDF417"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "TBarcode"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "TBarcode"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Raw code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (bez sumy kontrolnej)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: automatycznie)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, kompletne ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (zwarta forma cyfr)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (bez sumy kontrolnej)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 lub EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "interleaved 2 of 5 (tylko cyfry, bez sumy kontrolnej)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (tylko cyfry)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (still EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-cyfrowy EAN; UPCA lub UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2D Barcode"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Code 128"
-
-#: barkode.cpp:737
-#, fuzzy
-msgid "EAN 2"
-msgstr "EAN 128"
-
-#: barkode.cpp:738
-#, fuzzy
-msgid "EAN 5"
-msgstr "EAN 8"
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "interleaved 2 of 5 (tylko cyfry)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "USPS Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-#, fuzzy
-msgid "Royal Mail"
-msgstr "Royal Mail 4 State"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-#, fuzzy
-msgid "UPCA"
-msgstr "UPC A"
-
-#: barkode.cpp:750
-#, fuzzy
-msgid "UPCE"
-msgstr "UPC E"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Drukowanie..."
 
@@ -506,443 +441,420 @@ msgstr "Nu. Artykułu : "
 msgid "Creating Images..."
 msgstr "Tworzenie obrazów..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Opis artykułu"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "&Drukuj"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Wstaw &kod kreskowy"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 msgid "Delete Row"
 msgstr ""
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "Importuj do tablicy"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Start:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Numer artykułu"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "&Utwórz obrazy..."
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Wybierz docelowy katalog"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Format pliku wyjściowego"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Użyj nazwy numeru &artykułu jako nazwy pliku"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Użyj numeru &kodu jako nazwy pliku"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 #, fuzzy
 msgid "Use &custom filename:"
 msgstr "Użyj nazwy numeru &artykułu jako nazwy pliku"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Nazwa klienta i numer.:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "&Zaawansowane..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importuj"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "&Edytor Etykiet"
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "&Usuń wszystkie"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Importuj z pliku..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Importuj ze schowka..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "Importuj barcode_basic"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Indeks"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Liczba etykiet"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Numer artykułu"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Grupa"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Wprowadź opis:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "Importuj z pliku..."
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Rodzaj Kodowania"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Liczba etykiet:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Nazwa pliku"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Nazwa pliku"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "Plik %1 nie istnieje."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Wprowadź prawidłowy ID artykułu"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Separator jest pusty. Wypełnij go do jakiejś wartości."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Następujące pozycje nie mogą być dodane:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Nie mozna wykonać polecenia:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Nowy Rektangiel"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Nowa Linia"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Nowy tekst"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Nowa Linia"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Nowy kod kreskowy"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Obecnie jest %1 buforowanych kodów."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Konfiguruj KBarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "Ustawienia SQL"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Ustawienia Wydruku"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Średnia rozdzielczość (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Wysoka rozdzielczość (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Bardzo wysoka rozdzielczość (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Rozdzielczość drukarki"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Format podglądu strony"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Separator:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Cudzysłowie:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "&Użyj do importu numeru artykułu klienta"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Format pliku:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Ilość"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Edytor etykiet"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Utwórz nową etykietę przy starcie"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Siatka:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Kolor Siatki:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Format Daty:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Gdy Nowy"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Gdy nowy artykuł"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Bez złamania linii"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Złamanie linii"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Wprowadź etykietę X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Nowa strona"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "No. Artykułu"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Gdy nowa grupa"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Kod kreskowy"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Bufor kodu"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Rozmiar bufora kodu"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Wyczyść"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Określa ile kodów kreskowych ma być buforowane na dysku twardym. Jeśli "
-"drukujesz dużo artykułów to dla najlepszych osiągów powinieneś określić "
-"tutaj tę samą liczbę artykułów,  jaka znajduje się w bazie danych. Jeden "
-"buforowany kod kreskowy potrzebuje około 20 kb miejsca na dysku.<qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Importuj adres"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Podgląd:"
 
@@ -999,7 +911,7 @@ msgstr ""
 "również niektóre definicje etykiet do tablic.<br>Po tym będzie można "
 "wypełnić te tablice kilkoma przykładowymi danymi."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "&Utwórz tablice"
 
@@ -1011,7 +923,7 @@ msgstr "&Dodaj przykładowe dane"
 msgid "Create Tables"
 msgstr "Utwórz tablice"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Połączenie nie powiodło się<qt>"
 
@@ -1031,44 +943,102 @@ msgstr ""
 "dystrybucji źródłowej i powinny być zawarte w twojej dystrybucji. Zainstaluj "
 "je."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importuj"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Importuj zaznaczone pliki do tablic"
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Importuj przykładowe dane"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Zmień etykietę"
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Kolumna"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Ustaw"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Pola bazy danych dla tej klolumny"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "Plik do importu"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Rodzaj Kodowania"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Importuj do tablicy"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Nazwa pliku"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Ustawienia Wydruku"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Importuj plik CVS"
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "&Usuń wszystkie"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "Nie można importować następującego wiersza:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Importowanie danych powiodło sie."
 
@@ -1140,8 +1110,8 @@ msgstr "Liczba pionowo:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1201,7 +1171,7 @@ msgstr "&Porządkuj"
 msgid "&Fill Color"
 msgstr "Wypełnij kolorem:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Kod kreskowy"
 
@@ -1215,7 +1185,7 @@ msgstr "Rotacja:"
 msgid "&Text"
 msgstr "Nowy tekst"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 #, fuzzy
 msgid "&Image"
 msgstr "...jako &Obraz"
@@ -1265,11 +1235,11 @@ msgstr ""
 "<qt>Dokumantacja KBarcode jest dostępna jako plik PDF do ściągnięcia z "
 "naszej witryny.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Pobierz teraz"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1277,25 +1247,25 @@ msgstr ""
 "<qt>Istnieje możliwość wspierania dalszego rozwoju programu KBarcode przez "
 "darowizny. Do tego celu zostanie użyty system PayPal.<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Wesprzyj teraz"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Obsługa kodów paskowych</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Nie</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Znaleziono</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1303,15 +1273,15 @@ msgstr ""
 "<p>Do obsługi <b>kodów</b> potrzebna jest instalacja <i>GNU Barcode</i> , "
 "<i>TBarcode</i> lub <i>PDF417 Enc</i>.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Obsługa Bazy danych</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Znaleziono sterownik: "
 
-#: dsmainwindow.cpp:252
+#: dsmainwindow.cpp:258
 msgid ""
 "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
@@ -1322,6 +1292,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Opis etykiety"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Generator Kodów..."
@@ -1354,182 +1345,182 @@ msgstr "&Edytuj Klientów"
 msgid "&Edit Customer Text"
 msgstr "&Edytuj Tekst Kliencki"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Statyczny"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Wybierz etykietę"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Zam&knij etykietę"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "&Ostatnie pliki"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "&importuj i drukuj plik wsadowy..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "&Zmień opis..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Wymaż obiekt..."
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "Tworzenie obrazów..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "&Zmień etykietę"
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Wstaw &kod kreskowy"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Wstaw &obraz"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Wstaw &tekst"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Wstaw pole bazy &danych"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Wstaw &tekst"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "Wstaw kresk&ę"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "Wstaw &prostokąt"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "Wstaw &elipsę"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Siatka"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "&Podgląd"
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Ksi&ążka adresowa"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "&Utwórz pojedynczy kod..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "&Narzędzia"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Na wierzch"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Bliżej"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Dalej"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Na tło"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Centruj po&ziomo"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Centruj pio&nowo"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Porządkuj"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Centruj"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Właściwości"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Opis etykiety"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Wprowadź opis:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Wymiar:"
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Szablon etykiety:"
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 msgid "Protected Item"
 msgstr ""
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Ortografia"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "Plik %1 nie istnieje."
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Dokument został zmodyfikowany.<br> <br>Czy chcesz go zapisać?</qt>"
@@ -1601,8 +1592,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Kod kreskowy"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1730,10 +1722,6 @@ msgstr "Do p&rawej"
 msgid "&Justify"
 msgstr "&Justyfikacja"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Nieprawidłowy kod paskowy!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Pozycja:"
@@ -1957,100 +1945,100 @@ msgstr "&Drukuj znaki kadru (ramki)"
 msgid "Image Saved in KBarcode"
 msgstr ""
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Kolor:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Szerokość kreski:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Styl kreski:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Ustawienia kodu:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&Na wierzch"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Rozstęp lewy:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Wysokość: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 #, fuzzy
 msgid "&Width:"
 msgstr "Szerokość kreski:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Nieobsługiwany format obrazu"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Wymiar:"
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 msgid "S&cale"
 msgstr ""
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Centruj po&ziomo"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Centruj pio&nowo"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2105,52 +2093,58 @@ msgstr "Teraz ponownie utworzymy tablice '"
 msgid "' and '"
 msgstr "' oraz '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Nie można utworzyć bazy danych "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Możesz kontynuować jeśli baza już istnieje.</qt>"
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr "KBarcode nie zdołał utworzyć wymaganej bazy danych. Utwórz ją ręcznie."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Tablica utworzona "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " poprawnie!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Nie można połaczyć się z bazą danych."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Teraz wymażemy całą tablicę: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Teraz wymażemy wszystkie tablice: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "Postęp importu SQL:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Nie można otworzyć pliku z danymi o definicjach etykiet."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Nie mozna wykonać polecenia:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2158,43 +2152,43 @@ msgstr ""
 "Tablice SQL programu KBarcode zmieniły się od ostatniej wersji. Program "
 "uaktualnił je bez utraty danych."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Udane połączenie do bazy danych"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Ustawienia bazy danych"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Użytkownik :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Hasło :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Baza danych :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Serwer :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Sterownik :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "Połącz &automatycznie przy starcie programu"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Wypróbuj ustawienia"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr "<b>Musisz wypróbować ustawienia bazy zanim przejdziesz dalej.</b>"
 
@@ -2278,11 +2272,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Opis etykiety"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2571,7 +2560,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2583,6 +2572,72 @@ msgstr ""
 "<qt>Plik zdaje sie być utworzony przez starszą wersję KBarcode. <br>Sprawdź "
 "czy zastosowana definicja etykiet jest poprawna:<br><b>"
 
+#, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 128"
+
+#, fuzzy
+#~ msgid "EAN 2"
+#~ msgstr "EAN 128"
+
+#, fuzzy
+#~ msgid "EAN 5"
+#~ msgstr "EAN 8"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "interleaved 2 of 5 (tylko cyfry)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "USPS Postnet"
+
+#, fuzzy
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail 4 State"
+
+#, fuzzy
+#~ msgid "UPCA"
+#~ msgstr "UPC A"
+
+#, fuzzy
+#~ msgid "UPCE"
+#~ msgstr "UPC E"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Bufor kodu"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Rozmiar bufora kodu"
+
+#~ msgid "&Clear"
+#~ msgstr "&Wyczyść"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Określa ile kodów kreskowych ma być buforowane na dysku twardym. "
+#~ "Jeśli drukujesz dużo artykułów to dla najlepszych osiągów powinieneś "
+#~ "określić tutaj tę samą liczbę artykułów,  jaka znajduje się w bazie "
+#~ "danych. Jeden buforowany kod kreskowy potrzebuje około 20 kb miejsca na "
+#~ "dysku.<qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Importuj adres"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Nieprawidłowy kod paskowy!"
+
 #~ msgid "BarcodeCache"
 #~ msgstr "BarcodeCache"
 
diff --git a/po/sv.po b/po/sv.po
index 2bd47f5..20e4698 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Anton Vaaranmaa <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -27,46 +27,46 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 #, fuzzy
 msgid "&Encoding Type:"
 msgstr "Typ av kodning:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 #, fuzzy
 msgid "&Value:"
 msgstr "Värde:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 #, fuzzy
 msgid "&Display text"
 msgstr "&Visa text"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr ""
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 #, fuzzy
 msgid "&Insert Data Field..."
 msgstr "Infoga etikett X"
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 #, fuzzy
 msgid "&Margin:"
 msgstr "Marginal:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 #, fuzzy
 msgid "&Rotation:"
 msgstr "Rotation:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 #, fuzzy
 msgid "&Scale (in permille):"
 msgstr "Skala (i promille):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 #, fuzzy
 msgid "&Crop:"
 msgstr "Beskär:"
@@ -84,222 +84,222 @@ msgstr "&Genera streckkod"
 msgid "&Print"
 msgstr "&Skriv ut"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Ett fel uppstod under sparandet av bilden"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Strecckodsinställningar"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr ""
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr ""
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 #, fuzzy
 msgid "TBarcode"
 msgstr "&Streckkod"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr ""
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 #, fuzzy
 msgid "Colors"
 msgstr "Rutnätets färg:"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr ""
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 #, fuzzy
 msgid "Module width (mm):"
 msgstr "Bredd (i millimeter)"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 #, fuzzy
 msgid "Barcode Height (mm):"
 msgstr "Höjd (i millimeter)"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr ""
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 #, fuzzy
 msgid "&Text above barcode"
 msgstr "&Spara streckkoden"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 #, fuzzy
 msgid "&Auto correction"
 msgstr "X-korrektion"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr ""
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
 msgstr ""
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr ""
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr ""
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr ""
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr ""
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr ""
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr ""
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr ""
 
 # fuzzyish
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 #, fuzzy
 msgid "Code 11 (1 digit)"
 msgstr "Code 128C (compact form digits)"
 
 # fuzzyish
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 #, fuzzy
 msgid "Code 11 (2 digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr ""
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr ""
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr ""
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr ""
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr ""
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr ""
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr ""
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr ""
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 #, fuzzy
 msgid "Code 128"
 msgstr "Rå code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr ""
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr ""
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 #, fuzzy
 msgid "Columns:"
 msgstr "Kommentar:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 #, fuzzy
 msgid "Error correction level:"
 msgstr "Y-korrektion"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr ""
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr ""
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr ""
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr ""
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr ""
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr ""
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 #, fuzzy
 msgid "Start:"
 msgstr "Standard:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 #, fuzzy
 msgid "Bar Color:"
 msgstr "Rutnätets färg:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 #, fuzzy
 msgid "Background Color:"
 msgstr "Rutnätets färg:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 #, fuzzy
 msgid "Text Color:"
 msgstr "Text&färg..."
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 msgid "Enable &Checksum"
 msgstr ""
 
@@ -317,7 +317,7 @@ msgstr "Placering av uppgifter:"
 msgid "&Print to File"
 msgstr ""
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 #, fuzzy
 msgid "&Filename:"
 msgstr "Filnamn"
@@ -342,156 +342,96 @@ msgstr ""
 msgid "EPCL Printer (EPCL)"
 msgstr ""
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 #, fuzzy
 msgid " [GNU Barcode]"
 msgstr "Ny streckkod"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 msgid " [PDF 417]"
 msgstr ""
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 #, fuzzy
 msgid " [TBarcode]"
 msgstr "&Streckkod"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 #, fuzzy
 msgid " [TBarcode2]"
 msgstr "&Streckkod"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr ""
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Rå code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 #, fuzzy
 msgid "Codabar (no checksum)"
 msgstr "Code 39 (utan kontrollsumma)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: automarkering)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, fullt utskrivbar ascii"
 
 # fuzzyish
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (compact form digits)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (utan kontrollsumma)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 och EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "överlappande 2 av 5 (enbart siffror, utan kontrollsumma)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "överlappande 2 av 5 (enbart siffror)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (fortfarande EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-siffrors EAN, UPCA och UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr ""
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr ""
-
-#: barkode.cpp:731
-#, fuzzy
-msgid "Code 11"
-msgstr "Rå code 128"
-
-#: barkode.cpp:733
-#, fuzzy
-msgid "Code 2 of 5"
-msgstr "Rå code 128"
-
-#: barkode.cpp:737
-msgid "EAN 2"
-msgstr ""
-
-#: barkode.cpp:738
-msgid "EAN 5"
-msgstr ""
-
-#: barkode.cpp:740
-#, fuzzy
-msgid "Interleaved 2 of 5"
-msgstr "överlappande 2 av 5 (enbart siffror)"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr ""
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr ""
-
-#: barkode.cpp:745
-#, fuzzy
-msgid "Postnet"
-msgstr "Position"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr ""
-
-#: barkode.cpp:747
-msgid "Royal Mail"
-msgstr ""
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr ""
-
-#: barkode.cpp:749
-msgid "UPCA"
-msgstr ""
-
-#: barkode.cpp:750
-msgid "UPCE"
-msgstr ""
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Skriver ut..."
 
@@ -509,459 +449,436 @@ msgstr "Artikelnummer : "
 msgid "Creating Images..."
 msgstr ""
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr ""
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
 #, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
+"want to print.</qt>"
 msgstr ""
 "<br><br>Denna inställningsguide hjälper dig med att ta i bruk en databas för "
 "KBarcode. Om du inte vill utnyttja databasmöjligheterna kan du hoppa över "
 "detta skede.</qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 #, fuzzy
 msgid "File Selection"
 msgstr "Beskrivning av artikeln"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr ""
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr ""
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr ""
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr ""
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr ""
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 #, fuzzy
 msgid "Print Data"
 msgstr "Skrivarens upplösning"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 #, fuzzy
 msgid "Insert Row"
 msgstr "Infoga &streckkod"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 #, fuzzy
 msgid "Delete Row"
 msgstr "Ta bort objektet"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 #, fuzzy
 msgid "Import Variables"
 msgstr "&Importera uppgifter och skriv ut som batchkörning"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
+"print out.</qt>"
 msgstr ""
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 #, fuzzy
 msgid "Serial start:"
 msgstr "Standard:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr ""
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 #, fuzzy
 msgid "Serial Number"
 msgstr "Artikelnummer"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr ""
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 #, fuzzy
 msgid "&Create images"
 msgstr "S&kapa databastabeller"
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr ""
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 #, fuzzy
 msgid "Output &Directory:"
 msgstr "Placering av uppgifter:"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 #, fuzzy
 msgid "Output File &Format:"
 msgstr "Placering av uppgifter:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr ""
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr ""
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 msgid "Use &custom filename:"
 msgstr ""
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr ""
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 #, fuzzy
 msgid "Customer name and no.:"
 msgstr "Kundnamn och nummer:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 #, fuzzy
 msgid "&Add..."
 msgstr "L&ägg till"
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 #, fuzzy
 msgid "&Import..."
 msgstr "&Importera"
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 #, fuzzy
 msgid "&Edit..."
 msgstr "&Etikett-editor"
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "&Ta bort alla"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 #, fuzzy
 msgid "Import from File ..."
 msgstr "&Importera uppgifter och skriv ut som batchkörning"
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 #, fuzzy
 msgid "Import from Clipboard ..."
 msgstr "&Kopiera till klippbordet"
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 #, fuzzy
 msgid "Import barcode_basic"
 msgstr "kbarcode"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Index"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Antal etiketter"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Artikelnummer"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Grupp"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr ""
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr ""
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 #, fuzzy
 msgid "Please enter a sql &query:"
 msgstr "Ange beskrivning"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 #, fuzzy
 msgid "Import from a &CSV file"
 msgstr "&Importera uppgifter och skriv ut som batchkörning"
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr ""
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 #, fuzzy
 msgid "&Encoding:"
 msgstr "Typ av kodning:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr ""
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 #, fuzzy
 msgid "&Number of labels to print:"
 msgstr "Antal etiketter:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:409
+#: batchwizard.cpp:413
 msgid ""
 "Remove selected contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr ""
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr ""
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr ""
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 #, fuzzy
 msgid "Given Name"
 msgstr "Filnamn"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 #, fuzzy
 msgid "Family Name"
 msgstr "Filnamn"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr ""
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "<qt>Denna fil existerar inte!<br></qt>"
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Var god och ange ett giltigt artikelnummer"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Avskiljaren är tom. Ge den ett värde."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>Följande objekt kan inte läggas till:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 #, fuzzy
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>Kan inte köra kommandot:<br><b>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr ""
 
-#: commands.cpp:436
+#: commands.cpp:434
 #, fuzzy
 msgid "New Rectangle"
 msgstr "Ny sida"
 
-#: commands.cpp:450
+#: commands.cpp:448
 #, fuzzy
 msgid "New Line"
 msgstr "Ny etikett"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Ny text"
 
-#: commands.cpp:477
+#: commands.cpp:475
 #, fuzzy
 msgid "New TextLine"
 msgstr "Ny etikett"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Ny streckkod"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr ""
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "Anpassa Kbarcode"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 #, fuzzy
 msgid "SQL Settings"
 msgstr "MySQL-inställningar"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Utskriftsinställningar"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Mellanstor upplösning (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Hög upplösning (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 #, fuzzy
 msgid "Very High Resolution (1200dpi)"
 msgstr "Hög upplösning (600dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 #, fuzzy
 msgid "Printer Resolution:"
 msgstr "Skrivarens upplösning"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 #, fuzzy
 msgid "Preview Page Format:"
 msgstr "Placering av uppgifter:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Avskiljare:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Citationstecken:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr ""
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Placering av uppgifter:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Kvantitet"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 #, fuzzy
 msgid "Label Editor"
 msgstr "&Etikett-editor"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 #, fuzzy
 msgid "&Create a new label on startup"
 msgstr "Fråga efter ny etikett vid uppstart av etikett-editorn"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Rutnät:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Rutnätets färg:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Datumformat:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Ny"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "För ny artikel"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Ingen radbrytning"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Radbrytning"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Infoga etikett X"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Ny sida"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Artikelnummer"
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "För ny grupp"
 
-#: configdialog.cpp:307
-#, fuzzy
-msgid "Barcode"
-msgstr "&Streckkod"
-
-#: configdialog.cpp:312
-#, fuzzy
-msgid "Barcode Cache"
-msgstr "KBarcode"
-
-#: configdialog.cpp:321
-#, fuzzy
-msgid "Barcode Cache Size:"
-msgstr "Strecckodsinställningar"
-
-#: configdialog.cpp:325
-#, fuzzy
-msgid "&Clear"
-msgstr "&Centrera"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr ""
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Förhandsgranskning: "
 
@@ -1019,7 +936,7 @@ msgstr ""
 "KBarcode tilllägger också färdiga etikettdefinitioner till tabellerna."
 "<br>Efter det kan du fylla i tabellerna med malldata och dina egna uppgifter."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "S&kapa databastabeller"
 
@@ -1031,7 +948,7 @@ msgstr "&L&ägg till malldata"
 msgid "Create Tables"
 msgstr "Skapa databastabeller"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Anslutningen misslyckades:<br>"
 
@@ -1051,46 +968,104 @@ msgstr ""
 "källkodsdistributionen av QT och troligtvis ingår de också i distributionen "
 "du använder. Var god och installera dessa drivrutiner."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "&Importera"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr ""
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "&Importera malldata"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "&Byt etikett"
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 #, fuzzy
 msgid "Column:"
 msgstr "Kommentar:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr ""
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr ""
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 #, fuzzy
 msgid "File to import:"
 msgstr "Placering av uppgifter:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 #, fuzzy
 msgid "Encoding:"
 msgstr "Typ av kodning:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr ""
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Filnamn"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Utskriftsinställningar"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&Importera uppgifter och skriv ut som batchkörning"
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "&Ta bort alla"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr ""
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr ""
 
@@ -1163,8 +1138,8 @@ msgstr "Vertikal storlek (inkl. marginal):"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1224,7 +1199,7 @@ msgstr "Or&dning"
 msgid "&Fill Color"
 msgstr "Rutnätets färg:"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Streckkod"
 
@@ -1238,7 +1213,7 @@ msgstr "Rotation:"
 msgid "&Text"
 msgstr "Text:"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 msgid "&Image"
 msgstr ""
 
@@ -1251,38 +1226,42 @@ msgstr ""
 msgid "Property changed"
 msgstr "Projektledare"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 #, fuzzy
 msgid "&Start Configuration Wizard..."
 msgstr "&Starta Inställningsguide"
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "&Ansluta till databasen"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "&Importera etikettdefinitioner"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "&Importera malldata"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr ""
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 #, fuzzy
 msgid "&Barcode Help..."
 msgstr "Info om &streckkoder"
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 #, fuzzy
 msgid "&Donate..."
 msgstr "&Donera"
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1290,11 +1269,11 @@ msgstr ""
 "<qt>Dokumentation till KBarcode är tillgänglig i form av PDF-fil från vår "
 "hemsida.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Ladda nu"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1345,6 +1324,27 @@ msgstr ""
 msgid "Expression: "
 msgstr ""
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+#, fuzzy
+msgid "Description"
+msgstr "Beskrivning av etiketten"
+
 #: kbarcode.cpp:51
 #, fuzzy
 msgid "Barcode &Generator..."
@@ -1381,192 +1381,192 @@ msgstr "&Redigera kunder"
 msgid "&Edit Customer Text"
 msgstr "&Redigera kundtexter"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
+"IMAGE and BARCODE."
 msgstr ""
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Statisk"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Välj etikett"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
 msgstr ""
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Stäng &etikett"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "&Senaste filer"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 #, fuzzy
 msgid "&Import and Print Batch File..."
 msgstr "&Importera uppgifter och skriv ut som batchkörning"
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 #, fuzzy
 msgid "&Change description..."
 msgstr "&Ändra beskrivning"
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "&Ta bort objektet"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr ""
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 #, fuzzy
 msgid "Print to &Image..."
 msgstr "S&kapa databastabeller"
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 #, fuzzy
 msgid "&Change Label..."
 msgstr "&Byt etikett"
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "Infoga &streckkod"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "Infoga &bild "
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "Infoga &text"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 #, fuzzy
 msgid "Insert &Data Field"
 msgstr "Infoga etikett X"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 #, fuzzy
 msgid "Insert &Text Line"
 msgstr "Infoga &text"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 #, fuzzy
 msgid "Insert &Line"
 msgstr "Infoga &text"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 #, fuzzy
 msgid "Insert &Rectangle"
 msgstr "Infoga &text"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 #, fuzzy
 msgid "Insert &Ellipse"
 msgstr "Infoga &text"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Rutnät"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 #, fuzzy
 msgid "&Preview..."
 msgstr "&Förhandsgranskning"
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr ""
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 #, fuzzy
 msgid "&Create Single Barcode..."
 msgstr "&Skapa enskild streckkod"
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "V&erktyg"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "&Överst"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "&Höj"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Sänk"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Lägg till bakgrunden"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "Centrera &horisontalt"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "Centrera &vertikalt"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "Or&dning"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Centrera"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr ""
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Beskrivning av etiketten"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Ange beskrivning"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Storlek: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Etikettmall: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 #, fuzzy
 msgid "Protected Item"
 msgstr "Förflyttat objekt"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Stavningskontroll"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 #, fuzzy
 msgid "The file %1 does not exist."
 msgstr "<qt>Denna fil existerar inte!<br></qt>"
 
-#: labeleditor.cpp:1054
+#: labeleditor.cpp:1050
 msgid ""
 "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Dokumentet har ändrats.<br><br>Vill du spara det?</qt>"
@@ -1639,8 +1639,9 @@ msgid "Import variable data from a specified csv file"
 msgstr ""
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "&Streckkod"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1769,10 +1770,6 @@ msgstr "Höge&rjustera"
 msgid "&Justify"
 msgstr "&Inpassa"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Streckkoden är ogiltig!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Position: "
@@ -1998,102 +1995,102 @@ msgstr ""
 msgid "Image Saved in KBarcode"
 msgstr "Ändring av steckkod"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr ""
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 #, fuzzy
 msgid "Color:"
 msgstr "Rutnätets färg:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr ""
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr ""
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 #, fuzzy
 msgid "90"
 msgstr "0"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr ""
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr ""
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 #, fuzzy
 msgid "Barcode Settings:"
 msgstr "Strecckodsinställningar"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr ""
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 #, fuzzy
 msgid "&Top:"
 msgstr "&Överst"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 #, fuzzy
 msgid "&Left:"
 msgstr "Vänster kant :"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 #, fuzzy
 msgid "&Height:"
 msgstr "mm<br>Höjd: "
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 msgid "&Width:"
 msgstr ""
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 #, fuzzy
 msgid "&Load image from path"
 msgstr "Bildformatet stöds inte"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr ""
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 #, fuzzy
 msgid "&Size"
 msgstr "Storlek: "
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr ""
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 #, fuzzy
 msgid "S&cale"
 msgstr "Skala:"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 #, fuzzy
 msgid "Mirror &Horizontaly"
 msgstr "Centrera &horisontalt"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 #, fuzzy
 msgid "Mirror &Vertically"
 msgstr "Centrera &vertikalt"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr ""
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr ""
 
@@ -2153,98 +2150,104 @@ msgstr "Vi kommer att ta bort hela databasen: "
 msgid "' and '"
 msgstr ""
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Kan inte skapa databasen "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr ""
 
-#: sqltables.cpp:178
+#: sqltables.cpp:182
 msgid ""
 "KBarcode could not create the required database. Please create it manually."
 msgstr ""
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Skapade tabellen "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " utan problem!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Kan inte ansluta till databasen."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 #, fuzzy
 msgid "We are going to delete the complete table: "
 msgstr "Vi kommer att ta bort hela databasen: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 #, fuzzy
 msgid "We are going to delete the complete tables: "
 msgstr "Vi kommer att ta bort hela databasen: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr ""
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Kan inte öppna datafilen som innehåller etikettdefinitionerna."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Kan inte köra kommandot:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
 msgstr ""
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Anslutning till databasen lyckades"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 #, fuzzy
 msgid "Database Settings"
 msgstr "Databas "
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Användarnamn :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Lösenord :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Databas :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Värddator :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Drivrutin :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 #, fuzzy
 msgid "&Autoconnect on program start"
 msgstr "&Anslut automatiskt vid programuppstart"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "&Prova inställningarna"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 #, fuzzy
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr "Anställ dina databasinställningar här.<br>"
@@ -2330,11 +2333,6 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-#, fuzzy
-msgid "Description"
-msgstr "Beskrivning av etiketten"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr ""
@@ -2621,7 +2619,7 @@ msgstr ""
 msgid "Formatted Address"
 msgstr ""
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr ""
 
@@ -2632,6 +2630,40 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Code 11"
+#~ msgstr "Rå code 128"
+
+#, fuzzy
+#~ msgid "Code 2 of 5"
+#~ msgstr "Rå code 128"
+
+#, fuzzy
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "överlappande 2 av 5 (enbart siffror)"
+
+#, fuzzy
+#~ msgid "Postnet"
+#~ msgstr "Position"
+
+#, fuzzy
+#~ msgid "Barcode Cache"
+#~ msgstr "KBarcode"
+
+#, fuzzy
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Strecckodsinställningar"
+
+#, fuzzy
+#~ msgid "&Clear"
+#~ msgstr "&Centrera"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Streckkoden är ogiltig!"
+
+#, fuzzy
 #~ msgid "BarcodeCache"
 #~ msgstr "KBarcode"
 
@@ -2934,10 +2966,6 @@ msgstr ""
 #~ msgid "&Copy to Clipboard"
 #~ msgstr "&Kopiera till klippbordet"
 
-#, fuzzy
-#~ msgid "&Import Data..."
-#~ msgstr "&Importera malldata"
-
 #~ msgid "Fit to Window"
 #~ msgstr "Anpassa bilden till fönstret"
 
diff --git a/po/tr.po b/po/tr.po
index 3be605a..15d486c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: yeni\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 22:33+0100\n"
+"POT-Creation-Date: 2007-10-13 14:52+0200\n"
 "PO-Revision-Date: 2006-03-21 17:33+0200\n"
 "Last-Translator: Furkan Duman <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -28,39 +28,39 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: barcodecombo.cpp:75
+#: barcodecombo.cpp:125
 msgid "&Encoding Type:"
 msgstr "&Kodlama Türü:"
 
-#: barcodecombo.cpp:84
+#: barcodecombo.cpp:134
 msgid "&Value:"
 msgstr "&Değer:"
 
-#: barcodecombo.cpp:107
+#: barcodecombo.cpp:159
 msgid "&Display text"
 msgstr "&Metin göster"
 
-#: barcodecombo.cpp:112
+#: barcodecombo.cpp:164
 msgid "&Advanced..."
 msgstr "&Gelişmiş..."
 
-#: barcodecombo.cpp:116 propertywidget.cpp:478
+#: barcodecombo.cpp:168 propertywidget.cpp:481
 msgid "&Insert Data Field..."
 msgstr "&Veri Alanı Ekle..."
 
-#: barcodecombo.cpp:121
+#: barcodecombo.cpp:173
 msgid "&Margin:"
 msgstr "&Kenar Boşluğu:"
 
-#: barcodecombo.cpp:128 propertywidget.cpp:138 propertywidget.cpp:463
+#: barcodecombo.cpp:180 propertywidget.cpp:140 propertywidget.cpp:466
 msgid "&Rotation:"
 msgstr "&Döndürme:"
 
-#: barcodecombo.cpp:135
+#: barcodecombo.cpp:187
 msgid "&Scale (in permille):"
 msgstr "&Oran (yüzdeye göre):"
 
-#: barcodecombo.cpp:142
+#: barcodecombo.cpp:194
 msgid "&Crop:"
 msgstr "&Kırp:"
 
@@ -76,63 +76,63 @@ msgstr "Ü&ret"
 msgid "&Print"
 msgstr "&Yazdır"
 
-#: barcodedialog.cpp:147
+#: barcodedialog.cpp:155
 msgid "An error occurred during saving the image"
 msgstr "Görüntü kaydedilirken bir hata meydana geldi"
 
-#: barcodedialogs.cpp:41
+#: barcodedialogs.cpp:43
 msgid "Barcode Settings"
 msgstr "Barkod Seçenekleri"
 
-#: barcodedialogs.cpp:47 barcodedialogs.cpp:246
+#: barcodedialogs.cpp:49 barcodedialogs.cpp:258
 msgid "PDF417"
 msgstr "PDF417"
 
-#: barcodedialogs.cpp:53
+#: barcodedialogs.cpp:55
 msgid "DataMatrix"
 msgstr "DataMatrix"
 
-#: barcodedialogs.cpp:59 barcodedialogs.cpp:106
+#: barcodedialogs.cpp:61 barcodedialogs.cpp:108
 msgid "TBarcode"
 msgstr "TBarcode"
 
-#: barcodedialogs.cpp:65 barcodedialogs.cpp:458
+#: barcodedialogs.cpp:67 barcodedialogs.cpp:480
 msgid "Barcode Writer in Pure Postscript"
 msgstr "Pure Postscript içindeki Barkod Writer"
 
-#: barcodedialogs.cpp:71 barcodedialogs.cpp:422
+#: barcodedialogs.cpp:73 barcodedialogs.cpp:444
 msgid "Colors"
 msgstr "Renkler"
 
-#: barcodedialogs.cpp:76 barcodedialogs.cpp:344
+#: barcodedialogs.cpp:78 barcodedialogs.cpp:366
 msgid "Sequence"
 msgstr "Sıra"
 
-#: barcodedialogs.cpp:114
+#: barcodedialogs.cpp:116
 msgid "Module width (mm):"
 msgstr "Birim genişliği (mm):"
 
-#: barcodedialogs.cpp:118
+#: barcodedialogs.cpp:120
 msgid "Barcode Height (mm):"
 msgstr "Barkod Yüksekliği (mm):"
 
-#: barcodedialogs.cpp:121
+#: barcodedialogs.cpp:123
 msgid "&Translate escape sequences"
 msgstr "&Kaçış sıralarını çevir"
 
-#: barcodedialogs.cpp:122
+#: barcodedialogs.cpp:124
 msgid "&Text above barcode"
 msgstr "&Metin barkodun üzerinde"
 
-#: barcodedialogs.cpp:123
+#: barcodedialogs.cpp:125
 msgid "&Auto correction"
 msgstr "&Otomatik düzeltme"
 
-#: barcodedialogs.cpp:127
+#: barcodedialogs.cpp:129
 msgid "&Checksum calculation method:"
 msgstr "&Kontrol toplamı hesaplama yöntemi:"
 
-#: barcodedialogs.cpp:141
+#: barcodedialogs.cpp:143
 msgid ""
 "<qt>Change the module with used by tbarcode. Take a look into the tbarcode "
 "documentation for details. Normaly you do not want to change this value.</qt>"
@@ -140,143 +140,143 @@ msgstr ""
 "<qt>TBarcode tarafından kullanılan birimi değiştirin. Ayrıntılar için "
 "TBarcode belgelerine bakın. Normalde bu değeri değiştirmemelisiniz.</qt>"
 
-#: barcodedialogs.cpp:156
+#: barcodedialogs.cpp:162
 msgid "No Checksum"
 msgstr "Kontrol Toplamı Yok"
 
-#: barcodedialogs.cpp:157
+#: barcodedialogs.cpp:163
 msgid "Default Checksum Method"
 msgstr "Öntanımlı Kontrol Toplamı Yöntemi"
 
-#: barcodedialogs.cpp:161
+#: barcodedialogs.cpp:167
 msgid "Modulo 10 Checksum"
 msgstr "Mod 10 Kontrol Toplamı"
 
-#: barcodedialogs.cpp:168
+#: barcodedialogs.cpp:174
 msgid "Module 43 (suggested for Code39 and Logmars, 1 digit)"
 msgstr "Mod 43 (Code39 ve Logmars için önerilir, 1 basamak)"
 
-#: barcodedialogs.cpp:171
+#: barcodedialogs.cpp:177
 msgid "Modula 47 (2 digits)"
 msgstr "Mod 47 (2 basamak)"
 
-#: barcodedialogs.cpp:174
+#: barcodedialogs.cpp:180
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: barcodedialogs.cpp:177
+#: barcodedialogs.cpp:183
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: barcodedialogs.cpp:180
+#: barcodedialogs.cpp:186
 msgid "Code 11 (1 digit)"
 msgstr "Code 11 (1 basamak)"
 
-#: barcodedialogs.cpp:181
+#: barcodedialogs.cpp:187
 msgid "Code 11 (2 digits)"
 msgstr "Code 11 (2 basamak)"
 
-#: barcodedialogs.cpp:185
+#: barcodedialogs.cpp:191
 msgid "USPS Postnet"
 msgstr "USPS Postnet"
 
-#: barcodedialogs.cpp:188
+#: barcodedialogs.cpp:194
 msgid "MSI (1 digit)"
 msgstr "MSI (1 basamak)"
 
-#: barcodedialogs.cpp:189
+#: barcodedialogs.cpp:195
 msgid "MSI (2 digits)"
 msgstr "MSI (2 basamak)"
 
-#: barcodedialogs.cpp:193 barkode.cpp:718 barkode.cpp:744 mybarcode.cpp:551
+#: barcodedialogs.cpp:199 barkode.cpp:710
 msgid "Plessey"
 msgstr "Plessey"
 
-#: barcodedialogs.cpp:196 barkode.cpp:739
+#: barcodedialogs.cpp:202
 msgid "EAN 8"
 msgstr "EAN 8"
 
-#: barcodedialogs.cpp:199 barkode.cpp:736
+#: barcodedialogs.cpp:205
 msgid "EAN 13"
 msgstr "EAN 13"
 
-#: barcodedialogs.cpp:202
+#: barcodedialogs.cpp:208
 msgid "UPC A"
 msgstr "UPC A"
 
-#: barcodedialogs.cpp:205
+#: barcodedialogs.cpp:211
 msgid "UPC E"
 msgstr "UPC E"
 
-#: barcodedialogs.cpp:208
+#: barcodedialogs.cpp:214
 msgid "EAN 128"
 msgstr "EAN 128"
 
-#: barcodedialogs.cpp:211 barkode.cpp:732
+#: barcodedialogs.cpp:217
 msgid "Code 128"
 msgstr "Code 128"
 
-#: barcodedialogs.cpp:214
+#: barcodedialogs.cpp:220
 msgid "Royal Mail 4 State"
 msgstr "Royal Mail 4 State"
 
-#: barcodedialogs.cpp:254
+#: barcodedialogs.cpp:266
 msgid "Rows:"
 msgstr "Satırlar:"
 
-#: barcodedialogs.cpp:258
+#: barcodedialogs.cpp:270
 msgid "Columns:"
 msgstr "Sütunlar:"
 
-#: barcodedialogs.cpp:262
+#: barcodedialogs.cpp:274
 msgid "Error correction level:"
 msgstr "Hata düzeltme seviyesi:"
 
-#: barcodedialogs.cpp:292
+#: barcodedialogs.cpp:314
 msgid "Data Matrix symbol sizes (rows x cols):"
 msgstr "Veri Matrisi sembol boyutları (satır x sütun):"
 
-#: barcodedialogs.cpp:296
+#: barcodedialogs.cpp:318
 msgid "Automatic calculation"
 msgstr "Otomatik hesaplama"
 
-#: barcodedialogs.cpp:350
+#: barcodedialogs.cpp:372
 msgid "&Enable sequence"
 msgstr "&Ardışıklığı etkinleştir"
 
-#: barcodedialogs.cpp:352
+#: barcodedialogs.cpp:374
 msgid "Iterate over numbers 0-9"
 msgstr "Numaralar üzerinden yineleme yap 0-9"
 
-#: barcodedialogs.cpp:353
+#: barcodedialogs.cpp:375
 msgid "Iterate over characters A-Z"
 msgstr "Harfler üzerinden yineleme yap A-Z"
 
-#: barcodedialogs.cpp:354
+#: barcodedialogs.cpp:376
 msgid "Iterate over A-Z, 0-9"
 msgstr "A-Z, 0-9 üzerinden yineleme yap"
 
-#: barcodedialogs.cpp:357
+#: barcodedialogs.cpp:379
 msgid "Step:"
 msgstr "Adım:"
 
-#: barcodedialogs.cpp:361
+#: barcodedialogs.cpp:383
 msgid "Start:"
 msgstr "Başlangıç:"
 
-#: barcodedialogs.cpp:433
+#: barcodedialogs.cpp:455
 msgid "Bar Color:"
 msgstr "Çubuk Rengi:"
 
-#: barcodedialogs.cpp:434
+#: barcodedialogs.cpp:456
 msgid "Background Color:"
 msgstr "Arka Renk:"
 
-#: barcodedialogs.cpp:435
+#: barcodedialogs.cpp:457
 msgid "Text Color:"
 msgstr "Metin Rengi:"
 
-#: barcodedialogs.cpp:461
+#: barcodedialogs.cpp:483
 msgid "Enable &Checksum"
 msgstr "&Kontrol Toplamı Etkin"
 
@@ -292,7 +292,7 @@ msgstr "Çı&ktı Biçemi:"
 msgid "&Print to File"
 msgstr "Dosyaya &Yazdır"
 
-#: barcodeprinterdlg.cpp:42 batchwizard.cpp:125 batchwizard.cpp:257
+#: barcodeprinterdlg.cpp:42 batchwizard.cpp:126 batchwizard.cpp:258
 msgid "&Filename:"
 msgstr "&Dosya adı:"
 
@@ -316,147 +316,91 @@ msgstr "Intermec Yazıcı (IPL)"
 msgid "EPCL Printer (EPCL)"
 msgstr "EPCL Yazıcı (EPCL)"
 
-#: barkode.cpp:660
+#: barkode.cpp:649
 msgid " [GNU Barcode]"
 msgstr " [GNU Barkod]"
 
-#: barkode.cpp:663
+#: barkode.cpp:652
 msgid " [PDF 417]"
 msgstr " [PDF 417]"
 
-#: barkode.cpp:666
+#: barkode.cpp:655
 msgid " [TBarcode]"
 msgstr " [TBarcode]"
 
-#: barkode.cpp:669
+#: barkode.cpp:658
 msgid " [TBarcode2]"
 msgstr " [TBarcode2]"
 
-#: barkode.cpp:672
+#: barkode.cpp:661
 msgid " [Barcode Writer in Pure Postscript]"
 msgstr " [Pure Postscript içindeki Barkod Writer]"
 
-#: barkode.cpp:704 mybarcode.cpp:547
+#: barkode.cpp:696
 msgid "Raw code 128"
 msgstr "Ham code 128"
 
-#: barkode.cpp:705 mybarcode.cpp:548
+#: barkode.cpp:697
 msgid "Codabar"
 msgstr "Codabar"
 
-#: barkode.cpp:706 mybarcode.cpp:549
+#: barkode.cpp:698
 msgid "Codabar (no checksum)"
 msgstr "Codabar (kontrol toplamı yok)"
 
-#: barkode.cpp:707 mybarcode.cpp:542
+#: barkode.cpp:699
 msgid "Code 128 (a,b,c: autoselection)"
 msgstr "Code 128 (a,b,c: otomatik seçim)"
 
-#: barkode.cpp:708 mybarcode.cpp:544
+#: barkode.cpp:700
 msgid "Code 128B, full printable ascii"
 msgstr "Code 128B, tamamen yazılabilir ascii"
 
-#: barkode.cpp:709 mybarcode.cpp:543
+#: barkode.cpp:701
 msgid "Code 128C (compact form digits)"
 msgstr "Code 128C (ufak form basamakları)"
 
-#: barkode.cpp:710 mybarcode.cpp:541
+#: barkode.cpp:702
 msgid "Code 39 (no checksum)"
 msgstr "Code 39 (kontrol toplamı yok)"
 
-#: barkode.cpp:711 barkode.cpp:734 mybarcode.cpp:540
+#: barkode.cpp:703
 msgid "Code 39"
 msgstr "Code 39"
 
-#: barkode.cpp:712 barkode.cpp:735 mybarcode.cpp:552
+#: barkode.cpp:704
 msgid "Code 93"
 msgstr "Code 93"
 
-#: barkode.cpp:713 mybarcode.cpp:537
+#: barkode.cpp:705
 msgid "EAN (EAN 8 or EAN 13)"
 msgstr "EAN (EAN 8 veya EAN 13)"
 
-#: barkode.cpp:714 mybarcode.cpp:546
+#: barkode.cpp:706
 msgid "interleaved 2 of 5 (only digits, no checksum)"
 msgstr "interleaved 2 of 5 (sadece basamaklar, kontrol toplamı yok)"
 
-#: barkode.cpp:715 mybarcode.cpp:545
+#: barkode.cpp:707
 msgid "interleaved 2 of 5 (only digits)"
 msgstr "interleaved 2 of 5 (sadece basamaklar)"
 
-#: barkode.cpp:716 mybarcode.cpp:539
+#: barkode.cpp:708
 msgid "ISBN (still EAN13)"
 msgstr "ISBN (hala EAN13)"
 
-#: barkode.cpp:717 barkode.cpp:743 mybarcode.cpp:550
+#: barkode.cpp:709
 msgid "MSI"
 msgstr "MSI"
 
-#: barkode.cpp:719 mybarcode.cpp:538
+#: barkode.cpp:711
 msgid "UPC (12-digit EAN; UPCA and UPCB)"
 msgstr "UPC (12-basamak EAN; UPCA ve UPCB)"
 
-#: barkode.cpp:724 mybarcode.cpp:556
+#: barkode.cpp:716
 msgid "pdf 417 2D Barcode"
 msgstr "pdf 417 2B Barkod"
 
-#: barkode.cpp:730
-msgid "Australian Post"
-msgstr "Australian Post"
-
-#: barkode.cpp:731
-msgid "Code 11"
-msgstr "Code 11"
-
-#: barkode.cpp:733
-msgid "Code 2 of 5"
-msgstr "Code 2 of 5"
-
-#: barkode.cpp:737
-msgid "EAN 2"
-msgstr "EAN 2"
-
-#: barkode.cpp:738
-msgid "EAN 5"
-msgstr "EAN 5"
-
-#: barkode.cpp:740
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
-
-#: barkode.cpp:741
-msgid "ISBN"
-msgstr "ISBN"
-
-#: barkode.cpp:742
-msgid "Kix (Dutch Postal)"
-msgstr "Kix (Dutch Postal)"
-
-#: barkode.cpp:745
-msgid "Postnet"
-msgstr "Postnet"
-
-#: barkode.cpp:746
-msgid "Rationalized Codabar"
-msgstr "Rationalized Codabar"
-
-#: barkode.cpp:747
-msgid "Royal Mail"
-msgstr "Royal Mail"
-
-#: barkode.cpp:748
-msgid "Symbol"
-msgstr "Symbol"
-
-#: barkode.cpp:749
-msgid "UPCA"
-msgstr "UPCA"
-
-#: barkode.cpp:750
-msgid "UPCE"
-msgstr "UPCE"
-
-#: batchprinter.cpp:111 batchprinter.cpp:340
+#: batchprinter.cpp:111 batchprinter.cpp:341
 msgid "Printing..."
 msgstr "Yazdırılıyor..."
 
@@ -474,421 +418,409 @@ msgstr "Madde No. : "
 msgid "Creating Images..."
 msgstr "Görüntüler oluşturuluyor..."
 
-#: batchprinter.cpp:336
+#: batchprinter.cpp:337
 msgid "<qt>Can't open the file or device <b>%1</b></qt>."
 msgstr "<qt>Aygıt veya dosya açılamadı <b>%1</b></qt>."
 
-#: batchwizard.cpp:116
+#: batchwizard.cpp:117
+#, fuzzy
 msgid ""
 "<qt>This wizard will guide you through the process of printing many labels "
 "with KBarcode.<br>The first step is to select the KBarcode label file you "
-"want to print.</qt"
-msgstr "<qt>Bu sihirbaz, KBarcode ile birçok etiket yazdırma işleminde size yol gösterecektir.<br>İlk adım, yazdırmak istediğiniz KBarcode etiketini seçmektir.</qt>"
+"want to print.</qt>"
+msgstr ""
+"<qt>Bu sihirbaz, KBarcode ile birçok etiket yazdırma işleminde size yol "
+"gösterecektir.<br>İlk adım, yazdırmak istediğiniz KBarcode etiketini "
+"seçmektir.</qt>"
 
-#: batchwizard.cpp:134
+#: batchwizard.cpp:135
 msgid "File Selection"
 msgstr "Dosya Seçimi"
 
-#: batchwizard.cpp:146
+#: batchwizard.cpp:147
 msgid "Print &labels without data"
 msgstr "Veri olmadan &etiket yazdır"
 
-#: batchwizard.cpp:147
+#: batchwizard.cpp:148
 msgid "Print &articles from KBarcodes SQL database"
 msgstr "KBarcode'un SQL veri tabanından maddeleri &yazdır"
 
-#: batchwizard.cpp:148
+#: batchwizard.cpp:149
 msgid "Import &variables and print"
 msgstr "&Değişkenleri içeri aktar ve yazdır"
 
-#: batchwizard.cpp:149
+#: batchwizard.cpp:150
 msgid "Print &contacts from your addressbook"
 msgstr "Adres defterinizdeki &kişileri yazdır"
 
-#: batchwizard.cpp:161
+#: batchwizard.cpp:162
 msgid "Data Source"
 msgstr "Veri Kaynağı"
 
-#: batchwizard.cpp:173
+#: batchwizard.cpp:174
 msgid "Print Data"
 msgstr "Veriyi Yazdır"
 
-#: batchwizard.cpp:184
+#: batchwizard.cpp:185
 msgid "Insert Row"
 msgstr "Satır Ekle"
 
-#: batchwizard.cpp:186
+#: batchwizard.cpp:187
 msgid "Delete Row"
 msgstr "Satır Sil"
 
-#: batchwizard.cpp:193
+#: batchwizard.cpp:194
 msgid "Import Variables"
 msgstr "Değişkenleri İçeri Aktar"
 
-#: batchwizard.cpp:205
+#: batchwizard.cpp:206
+#, fuzzy
 msgid ""
 "<qt>KBarcode has support for placing serial numbers on labels. If you did "
 "not use the [serial] token on your label in a text field or a barcode, you "
 "can skip this page.<br>Serial start is a free form start value containing at "
 "least one number. This number is increased for every printed label on the "
-"print out.</qt"
-msgstr "<qt>KBarcode etiketlere ardışık numara verebilme desteğine sahiptir. Eğer barkodunuzda veya etiketinizdeki bir metin alanı içerisinde, [serial] simgesini kullanmadıysanız bu sayfayı atlayabilirsiniz.<br>Ardışık başlangıç, en az bir numara içeren, baaşlangıç değerinin özgür bir şeklidir. Bu numara, çıktınızdaki her yazdırılan etikette arttırılacaktır.</qt>"
+"print out.</qt>"
+msgstr ""
+"<qt>KBarcode etiketlere ardışık numara verebilme desteğine sahiptir. Eğer "
+"barkodunuzda veya etiketinizdeki bir metin alanı içerisinde, [serial] "
+"simgesini kullanmadıysanız bu sayfayı atlayabilirsiniz.<br>Ardışık "
+"başlangıç, en az bir numara içeren, baaşlangıç değerinin özgür bir şeklidir. "
+"Bu numara, çıktınızdaki her yazdırılan etikette arttırılacaktır.</qt>"
 
-#: batchwizard.cpp:215 previewdialog.cpp:104
+#: batchwizard.cpp:216 previewdialog.cpp:104
 msgid "Serial start:"
 msgstr "Ardışık başlangıç:"
 
-#: batchwizard.cpp:219 previewdialog.cpp:106
+#: batchwizard.cpp:220 previewdialog.cpp:106
 msgid "Serial increment:"
 msgstr "Ardışık artış:"
 
-#: batchwizard.cpp:222
+#: batchwizard.cpp:223
 msgid "Serial Number"
 msgstr "Ardışık Numara"
 
-#: batchwizard.cpp:232
+#: batchwizard.cpp:233
 msgid "&Print to a system printer or to a file"
 msgstr "Bir dosyaya veya sistem yazıcısına &yazdır"
 
-#: batchwizard.cpp:233
+#: batchwizard.cpp:234
 msgid "&Create images"
 msgstr "Görüntü &oluştur"
 
-#: batchwizard.cpp:238
+#: batchwizard.cpp:239
 msgid "Print to a special &barcode printer"
 msgstr "Özel &barkod yazıcısında yazdır"
 
-#: batchwizard.cpp:242
+#: batchwizard.cpp:243
 msgid "Output &Directory:"
 msgstr "İhraç &Dizini:"
 
-#: batchwizard.cpp:248
+#: batchwizard.cpp:249
 msgid "Output File &Format:"
 msgstr "İhraç Dosya &Biçimi:"
 
-#: batchwizard.cpp:258
+#: batchwizard.cpp:259
 msgid "Use &article number for filename"
 msgstr "Dosya adı için &madde numarası kullan"
 
-#: batchwizard.cpp:259
+#: batchwizard.cpp:260
 msgid "Use &barcode number for filename"
 msgstr "Dosya adı için &barkod numarası kullan"
 
-#: batchwizard.cpp:260
+#: batchwizard.cpp:261
 msgid "Use &custom filename:"
 msgstr "&Farklı dosya adı kullan:"
 
-#: batchwizard.cpp:283
+#: batchwizard.cpp:269
+msgid "&Keep window open after printing."
+msgstr ""
+
+#: batchwizard.cpp:287
 msgid "Output Device"
 msgstr "Çıkış Aygıtı"
 
-#: batchwizard.cpp:294
+#: batchwizard.cpp:298
 msgid "Customer name and no.:"
 msgstr "Müşteri adı ve numarası:"
 
-#: batchwizard.cpp:301
+#: batchwizard.cpp:305
 msgid "&Add..."
 msgstr "&Ekle..."
 
-#: batchwizard.cpp:302
+#: batchwizard.cpp:306
 msgid "&Import..."
 msgstr "&İçe Aktar..."
 
-#: batchwizard.cpp:303
+#: batchwizard.cpp:307
 msgid "&Edit..."
 msgstr "&Düzenle..."
 
-#: batchwizard.cpp:305
+#: batchwizard.cpp:309
 msgid "R&emove All"
 msgstr "Hepsini &Kaldır"
 
-#: batchwizard.cpp:308
+#: batchwizard.cpp:312
 msgid "Import from File ..."
 msgstr "Dosyadan içe Aktar ..."
 
-#: batchwizard.cpp:309
+#: batchwizard.cpp:313
 msgid "Import from Clipboard ..."
 msgstr "Panodan içe Aktar..."
 
-#: batchwizard.cpp:310
+#: batchwizard.cpp:314
 msgid "Import barcode_basic"
 msgstr "barcode_basic ithal et"
 
-#: batchwizard.cpp:314
+#: batchwizard.cpp:318
 msgid "Index"
 msgstr "Dizin"
 
-#: batchwizard.cpp:315
+#: batchwizard.cpp:319
 msgid "Number of Labels"
 msgstr "Etiket Sayısı"
 
-#: batchwizard.cpp:316 configdialog.cpp:160 configdialog.cpp:166
-#: configdialog.cpp:172
+#: batchwizard.cpp:320 configdialog.cpp:157 configdialog.cpp:163
+#: configdialog.cpp:169
 msgid "Article Number"
 msgstr "Madde Numarası"
 
-#: batchwizard.cpp:317 configdialog.cpp:161 configdialog.cpp:167
-#: configdialog.cpp:173
+#: batchwizard.cpp:321 configdialog.cpp:158 configdialog.cpp:164
+#: configdialog.cpp:170
 msgid "Group"
 msgstr "Grup"
 
-#: batchwizard.cpp:339
+#: batchwizard.cpp:343
 msgid "Enter &data manually"
 msgstr "&Veriyi elle gir"
 
-#: batchwizard.cpp:340
+#: batchwizard.cpp:344
 msgid "Import variables from a &SQL table"
 msgstr "Bir &SQL tablosundan değerleri içe aktar"
 
-#: batchwizard.cpp:341
+#: batchwizard.cpp:345
 msgid "Please enter a sql &query:"
 msgstr "Lütfen bir sql &sorgusu girin:"
 
-#: batchwizard.cpp:345
+#: batchwizard.cpp:349
 msgid "Import from a &CSV file"
 msgstr "&CSV dosyasından içe aktar"
 
-#: batchwizard.cpp:346
+#: batchwizard.cpp:350
 msgid "Please select a csv &file:"
 msgstr "Lütfen bir CSV dosyası &seçin:"
 
-#: batchwizard.cpp:349
+#: batchwizard.cpp:353
 msgid "&Encoding:"
 msgstr "&Kodlama:"
 
-#: batchwizard.cpp:358
+#: batchwizard.cpp:362
 msgid "Available Variables:"
 msgstr "Mevcut Değişkenler:"
 
-#: batchwizard.cpp:376
+#: batchwizard.cpp:380
 msgid "&Number of labels to print:"
 msgstr "&Yazdırılacak etiket sayısı:"
 
-#: batchwizard.cpp:407
+#: batchwizard.cpp:411
 msgid "Add all contacts to the list of contacts which will be printed."
 msgstr "Kişiler listesine yazdırılacak olan bütün kişileri ekleyin."
 
-#: batchwizard.cpp:408
+#: batchwizard.cpp:412
 msgid "Add selected contacts to the list of contacts which will be printed."
 msgstr "Kişiler listesine, yazdırılacak olan seçilmiş kişileri ekleyin."
 
-#: batchwizard.cpp:409
-msgid "Remove selected contacts from the list of contacts which will be printed."
+#: batchwizard.cpp:413
+msgid ""
+"Remove selected contacts from the list of contacts which will be printed."
 msgstr "Kişiler listesinden, yazdırılacak olan, seçilmiş kişileri kaldırın."
 
-#: batchwizard.cpp:410
+#: batchwizard.cpp:414
 msgid "Remove all contacts from the list of contacts which will be printed."
 msgstr "Kişiler listesinden, yazdırılacak olan bütün kişileri kaldırın."
 
-#: batchwizard.cpp:426
+#: batchwizard.cpp:430
 msgid "All Addresses"
 msgstr "Bütün Adresler"
 
-#: batchwizard.cpp:427
+#: batchwizard.cpp:431
 msgid "Selected Addresses"
 msgstr "Seçilmiş Adresler"
 
-#: batchwizard.cpp:430 batchwizard.cpp:441
+#: batchwizard.cpp:434 batchwizard.cpp:445
 msgid "Given Name"
 msgstr "Verilen İsim"
 
-#: batchwizard.cpp:431 batchwizard.cpp:442
+#: batchwizard.cpp:435 batchwizard.cpp:446
 msgid "Family Name"
 msgstr "Aile Adı"
 
-#: batchwizard.cpp:432 batchwizard.cpp:443
+#: batchwizard.cpp:436 batchwizard.cpp:447
 msgid "Email Address"
 msgstr "E-posta Adresi"
 
-#: batchwizard.cpp:726
+#: batchwizard.cpp:561
+#, fuzzy
+msgid "The label file %1 was not found"
+msgstr "%1 dosyası bulunamadı."
+
+#: batchwizard.cpp:743
 msgid "Please enter a valid article ID"
 msgstr "Lütfen geçerli bir madde no'su girin"
 
-#: batchwizard.cpp:882
+#: batchwizard.cpp:901
 msgid "Separator is empty. Please set it to a value."
 msgstr "Ayıraç boş. Lütfen bir değer atayın."
 
-#: batchwizard.cpp:953 batchwizard.cpp:955
+#: batchwizard.cpp:972 batchwizard.cpp:974
 msgid "<qt>The following items can not be added:"
 msgstr "<qt>İzleyen öğeler eklenemedi:"
 
-#: batchwizard.cpp:1035
+#: batchwizard.cpp:1056
 msgid "<qt>Can't execute SQL query:<br>"
 msgstr "<qt>SQL sorgusu çalıştırılamadı:<br>"
 
-#: batchwizard.cpp:1061
+#: batchwizard.cpp:1083
 msgid "Can't open file: %1"
 msgstr "Dosya açılamadı: %1"
 
-#: commands.cpp:436
+#: commands.cpp:434
 msgid "New Rectangle"
 msgstr "Yeni Dörtgen"
 
-#: commands.cpp:450
+#: commands.cpp:448
 msgid "New Line"
 msgstr "Yeni Çizgi"
 
-#: commands.cpp:460
+#: commands.cpp:458
 msgid "New Text"
 msgstr "Yeni Metin"
 
-#: commands.cpp:477
+#: commands.cpp:475
 msgid "New TextLine"
 msgstr "Yeni metin çizgisi"
 
-#: commands.cpp:494
+#: commands.cpp:492
 msgid "New Barcode"
 msgstr "Yeni Barkod"
 
-#: configdialog.cpp:47
+#: configdialog.cpp:46
 msgid "There are currently %1 cached barcodes."
 msgstr "Şu an %1 önbelleklenen barkod var."
 
-#: configdialog.cpp:51 confwizard.cpp:59
+#: configdialog.cpp:50 confwizard.cpp:59
 msgid "Configure KBarcode"
 msgstr "KBarcode'yi Ayarla"
 
-#: configdialog.cpp:69
+#: configdialog.cpp:66
 msgid "SQL Settings"
 msgstr "SQL Seçenekleri"
 
-#: configdialog.cpp:83
+#: configdialog.cpp:80
 msgid "Print Settings"
 msgstr "Yazdırma Seçenekleri"
 
-#: configdialog.cpp:91
+#: configdialog.cpp:88
 msgid "Medium Resolution (300dpi)"
 msgstr "Orta Çözünürlük (300dpi)"
 
-#: configdialog.cpp:92
+#: configdialog.cpp:89
 msgid "High Resolution (600dpi)"
 msgstr "Yüksek Çözünürlük (600dpi)"
 
-#: configdialog.cpp:93
+#: configdialog.cpp:90
 msgid "Very High Resolution (1200dpi)"
 msgstr "Çok Yüksek Çözünürlük (1200dpi)"
 
-#: configdialog.cpp:113
+#: configdialog.cpp:110
 msgid "Printer Resolution:"
 msgstr "Yazıcı Çözünürlüğü:"
 
-#: configdialog.cpp:115
+#: configdialog.cpp:112
 msgid "Preview Page Format:"
 msgstr "Sayfa Öngörünüm Biçimi:"
 
-#: configdialog.cpp:130
+#: configdialog.cpp:127 csvimportdlg.cpp:175
 msgid "Comment:"
 msgstr "Açıklama:"
 
-#: configdialog.cpp:137
+#: configdialog.cpp:134 csvimportdlg.cpp:182
 msgid "Separator:"
 msgstr "Ayıraç:"
 
-#: configdialog.cpp:144
+#: configdialog.cpp:141 csvimportdlg.cpp:189
 msgid "Quote Character:"
 msgstr "Alıntı Karakteri:"
 
-#: configdialog.cpp:150
+#: configdialog.cpp:147
 msgid "&Use customer article no. for import"
 msgstr "&İçe aktarmak için müşteri madde numarasını kullan"
 
-#: configdialog.cpp:156
+#: configdialog.cpp:153 csvimportdlg.cpp:156
 msgid "File Format:"
 msgstr "Dosya Biçimi:"
 
-#: configdialog.cpp:159 configdialog.cpp:165 configdialog.cpp:171
+#: configdialog.cpp:156 configdialog.cpp:162 configdialog.cpp:168
 msgid "Quantity"
 msgstr "Miktar"
 
-#: configdialog.cpp:189
+#: configdialog.cpp:186
 msgid "Label Editor"
 msgstr "Etiket Düzenleyici"
 
-#: configdialog.cpp:193
+#: configdialog.cpp:190
 msgid "&Create a new label on startup"
 msgstr "&Açılışta yeni bir etiket oluştur"
 
-#: configdialog.cpp:201
+#: configdialog.cpp:198
 msgid "Grid:"
 msgstr "Izgara:"
 
-#: configdialog.cpp:208
+#: configdialog.cpp:205
 msgid "Grid Color:"
 msgstr "Izgara Rengi:"
 
-#: configdialog.cpp:210
+#: configdialog.cpp:207
 msgid "Date Format:"
 msgstr "Tarih Biçimi:"
 
-#: configdialog.cpp:218
+#: configdialog.cpp:215
 msgid "On New"
 msgstr "Yeni"
 
-#: configdialog.cpp:222
+#: configdialog.cpp:219
 msgid "On New Article"
 msgstr "Yeni Maddede"
 
-#: configdialog.cpp:229 configdialog.cpp:235
+#: configdialog.cpp:226 configdialog.cpp:232
 msgid "No Line Break"
 msgstr "Satır Sonu Yok"
 
-#: configdialog.cpp:230 configdialog.cpp:236
+#: configdialog.cpp:227 configdialog.cpp:233
 msgid "Line Break"
 msgstr "Satır Sonu"
 
-#: configdialog.cpp:231 configdialog.cpp:237
+#: configdialog.cpp:228 configdialog.cpp:234
 msgid "Insert Label X"
 msgstr "Etiket X Ekle"
 
-#: configdialog.cpp:232 configdialog.cpp:238
+#: configdialog.cpp:229 configdialog.cpp:235
 msgid "New Page"
 msgstr "Yeni Sayfa"
 
-#: configdialog.cpp:233
+#: configdialog.cpp:230
 msgid "Article No."
 msgstr "Madde No."
 
-#: configdialog.cpp:239
+#: configdialog.cpp:236
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: configdialog.cpp:263
+#: configdialog.cpp:260
 msgid "On New Group"
 msgstr "Yeni Grupta"
 
-#: configdialog.cpp:307
-msgid "Barcode"
-msgstr "Barkod"
-
-#: configdialog.cpp:312
-msgid "Barcode Cache"
-msgstr "Barkod Önbelleği"
-
-#: configdialog.cpp:321
-msgid "Barcode Cache Size:"
-msgstr "Barkod Önbellek Boyutu:"
-
-#: configdialog.cpp:325
-msgid "&Clear"
-msgstr "&Temizle"
-
-#: configdialog.cpp:338
-msgid ""
-"<qt>Specifies how many barcodes should be cached on the harddisk.If you "
-"print lot's of articles, you should set this to be the same as the number of "
-"articles in your database to get best speed results.One cached barcode "
-"requires about 20kb of diskspace.</qt>"
-msgstr ""
-"<qt>Kaç adet barkodun disk üzerinde önbellekleneceğini belirtir. Birçok "
-"madde yazdırıyorsanız, en iyi hız sonucunu elde etmek için bunu, "
-"veritabanınızdaki madde sayısı olarak ayarlamalısınız. Bir adet "
-"önbelleklenmiş barkod, yaklaşık 20 Kb disk alanı gerektirir.</qt>"
-
 #: configdialog.cpp:348
-msgid "Address Import"
-msgstr "Adres İçe Aktarma"
-
-#: configdialog.cpp:466
 msgid "Preview: "
 msgstr "Öngörünüm: "
 
@@ -945,7 +877,7 @@ msgstr ""
 "bazı etiket tanımlarını tablolara ekleyecektir.<br>Bundan sonra tabloları, "
 "bazı örnek verilerle doldurabilirsiniz."
 
-#: confwizard.cpp:160 dsmainwindow.cpp:77
+#: confwizard.cpp:160 dsmainwindow.cpp:78
 msgid "&Create Tables"
 msgstr "Tabloları &Oluştur"
 
@@ -957,7 +889,7 @@ msgstr "Örnek Veri &Ekle"
 msgid "Create Tables"
 msgstr "Tablo Oluştur"
 
-#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:442
+#: confwizard.cpp:196 confwizard.cpp:219 sqltables.cpp:468
 msgid "<qt>Connection failed:<br>"
 msgstr "<qt>Bağlantı başarısız:<br>"
 
@@ -977,43 +909,101 @@ msgstr ""
 "parçasıdır ve aynı zamanda sizin dağıtımınızın da bir parçası olmalıdır. "
 "Lütfen ilk önce onları kurun."
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "&Import"
 msgstr "İçe &Aktar"
 
-#: csvimportdlg.cpp:52
+#: csvimportdlg.cpp:61
 msgid "Import the selected file into your tables."
 msgstr "Seçilen dosyayı tablolarınıza aktarır."
 
-#: csvimportdlg.cpp:72
+#: csvimportdlg.cpp:93
+#, fuzzy
+msgid "&Import Data"
+msgstr "Örnek Veriyi içe &Aktar"
+
+#: csvimportdlg.cpp:104
+#, fuzzy
+msgid "Other table..."
+msgstr "Etiketi &Değiştir..."
+
+#: csvimportdlg.cpp:107
+msgid "&Load complete file into preview"
+msgstr ""
+
+#: csvimportdlg.cpp:109
+msgid "Load only a number of datasets:"
+msgstr ""
+
+#: csvimportdlg.cpp:120
 msgid "Column:"
 msgstr "Sütun:"
 
-#: csvimportdlg.cpp:76
+#: csvimportdlg.cpp:124
 msgid "Set"
 msgstr "Ayarla"
 
-#: csvimportdlg.cpp:79
+#: csvimportdlg.cpp:127
 msgid "Database field to use for this column:"
 msgstr "Bu sütun için kullanılan veri tabanı alanı:"
 
-#: csvimportdlg.cpp:83
+#: csvimportdlg.cpp:131
 msgid "File to import:"
 msgstr "içe aktarılan dosya:"
 
-#: csvimportdlg.cpp:85
+#: csvimportdlg.cpp:133
 msgid "Encoding:"
 msgstr "Kodlama:"
 
-#: csvimportdlg.cpp:87
+#: csvimportdlg.cpp:135
 msgid "Import into table:"
 msgstr "Tabloya aktarılan:"
 
-#: csvimportdlg.cpp:221
+#: csvimportdlg.cpp:137
+#, fuzzy
+msgid "Table Name:"
+msgstr "Aile Adı"
+
+#: csvimportdlg.cpp:151
+#, fuzzy
+msgid "&Import Settings"
+msgstr "Yazdırma Seçenekleri"
+
+#: csvimportdlg.cpp:157
+#, fuzzy
+msgid "&CSV File"
+msgstr "&CSV Dosyasını İçe Aktar..."
+
+#: csvimportdlg.cpp:158
+msgid "File with &fixed field width"
+msgstr ""
+
+#: csvimportdlg.cpp:162
+msgid "CSV File"
+msgstr ""
+
+#: csvimportdlg.cpp:163
+msgid "Fixed Field Width File"
+msgstr ""
+
+#: csvimportdlg.cpp:207
+msgid "&Add Field"
+msgstr ""
+
+#: csvimportdlg.cpp:210
+#, fuzzy
+msgid "&Remove Field"
+msgstr "Hepsini &Kaldır"
+
+#: csvimportdlg.cpp:357
+msgid "Cannot load data from the file:"
+msgstr ""
+
+#: csvimportdlg.cpp:378
 msgid "Could not import the following line:"
 msgstr "İzleyen satır aktarılamadı:"
 
-#: csvimportdlg.cpp:224
+#: csvimportdlg.cpp:383
 msgid "Data was imported successfully."
 msgstr "Veri başarıyla içe aktarıldı."
 
@@ -1083,8 +1073,8 @@ msgstr "Düşey Numara:"
 
 #: definitiondialog.cpp:142 definitiondialog.cpp:147 definitiondialog.cpp:152
 #: definitiondialog.cpp:157 definitiondialog.cpp:162 definitiondialog.cpp:167
-#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:142
-#: propertywidget.cpp:481
+#: definitiondialog.cpp:172 definitiondialog.cpp:177 propertywidget.cpp:144
+#: propertywidget.cpp:484
 msgid "0"
 msgstr "0"
 
@@ -1141,7 +1131,7 @@ msgstr "Çerçe&ve"
 msgid "&Fill Color"
 msgstr "&Dolgu Rengi"
 
-#: documentitemdlg.cpp:47 labeleditor.cpp:530
+#: documentitemdlg.cpp:47 labeleditor.cpp:526
 msgid "&Barcode"
 msgstr "&Barkod"
 
@@ -1153,7 +1143,7 @@ msgstr "&Döndürme"
 msgid "&Text"
 msgstr "&Metin"
 
-#: documentitemdlg.cpp:60 propertywidget.cpp:467
+#: documentitemdlg.cpp:60 propertywidget.cpp:470
 msgid "&Image"
 msgstr "&Resim"
 
@@ -1165,35 +1155,39 @@ msgstr "&Görünürlük"
 msgid "Property changed"
 msgstr "Özellik değiştirildi"
 
-#: dsmainwindow.cpp:71
+#: dsmainwindow.cpp:72
 msgid "&Start Configuration Wizard..."
 msgstr "Ayar Sihirbazını &Başlat..."
 
-#: dsmainwindow.cpp:73
+#: dsmainwindow.cpp:74
 msgid "&Connect to Database"
 msgstr "Veritabanına &Bağlan"
 
-#: dsmainwindow.cpp:80
+#: dsmainwindow.cpp:81
 msgid "&Import Label Definitions"
 msgstr "Etiket Tanımlamalarını &Aktar"
 
-#: dsmainwindow.cpp:83
+#: dsmainwindow.cpp:84
 msgid "&Import Example Data"
 msgstr "Örnek Veriyi içe &Aktar"
 
-#: dsmainwindow.cpp:94
+#: dsmainwindow.cpp:95
+msgid "&Action Map..."
+msgstr ""
+
+#: dsmainwindow.cpp:97
 msgid "&System Check..."
 msgstr "&Sistem Kontrolü..."
 
-#: dsmainwindow.cpp:95
+#: dsmainwindow.cpp:98
 msgid "&Barcode Help..."
 msgstr "&Barkod Yardım..."
 
-#: dsmainwindow.cpp:96
+#: dsmainwindow.cpp:99
 msgid "&Donate..."
 msgstr "&Bağış..."
 
-#: dsmainwindow.cpp:179
+#: dsmainwindow.cpp:182
 msgid ""
 "<qt>The KBarcode documentation is avaible as PDF for download on our webpage."
 "<br><br>"
@@ -1201,11 +1195,11 @@ msgstr ""
 "<qt>KBarcode belgesi, indirebilmeniz için PDF olarak web sayfamızda "
 "bulunmaktadır.<br><br>"
 
-#: dsmainwindow.cpp:181
+#: dsmainwindow.cpp:184
 msgid "Download Now"
 msgstr "Şimdi İndir"
 
-#: dsmainwindow.cpp:211
+#: dsmainwindow.cpp:214
 msgid ""
 "<qt>It is possible to support the further development of KBarcode through "
 "donations. PayPal will be used for processing the donation.<br><br>"
@@ -1214,25 +1208,25 @@ msgstr ""
 "destekleyebilmeniz mümkündür. Bağışlarınız için PayPal kullanılacaktır."
 "<br><br>"
 
-#: dsmainwindow.cpp:214
+#: dsmainwindow.cpp:217
 msgid "Donate Now"
 msgstr "Şimdi Bağış Yap"
 
-#: dsmainwindow.cpp:226
+#: dsmainwindow.cpp:230
 msgid "<p><h3>Barcode Support</h3></p>"
 msgstr "<p><h3>Barkod desteği</h3></p>"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>No</b><br />"
 msgstr "<b>Yok</b><br />"
 
-#: dsmainwindow.cpp:228 dsmainwindow.cpp:230 dsmainwindow.cpp:232
-#: dsmainwindow.cpp:234
+#: dsmainwindow.cpp:232 dsmainwindow.cpp:234 dsmainwindow.cpp:236
+#: dsmainwindow.cpp:238 dsmainwindow.cpp:240
 msgid "<b>Found</b><br />"
 msgstr "<b>Bulundu</b><br />"
 
-#: dsmainwindow.cpp:237
+#: dsmainwindow.cpp:243
 msgid ""
 "<p>To get <b>barcode support</b> you have to install <i>GNU Barcode</"
 "i>, <i>TBarcode</i> or <i>PDF417 Enc</i>.</p>"
@@ -1240,16 +1234,17 @@ msgstr ""
 "<p><b>barkode desteğinin</b> olması için <i>GNU Barcode</i>, <i>TBarcode</i> "
 "veya <i>PDF417 Enc</i> de kurmalısınız.</p>"
 
-#: dsmainwindow.cpp:239
+#: dsmainwindow.cpp:245
 msgid "<p><h3>Database Support</h3></p>"
 msgstr "<p><h3>Veri tabanı Desteği</h3></p>"
 
-#: dsmainwindow.cpp:247
+#: dsmainwindow.cpp:253
 msgid "<li>Driver found: "
 msgstr "<li>Sürücü bulundu: "
 
-#: dsmainwindow.cpp:252
-msgid "<p><b>No database drivers found. SQL database support is disabled.</b></p>"
+#: dsmainwindow.cpp:258
+msgid ""
+"<p><b>No database drivers found. SQL database support is disabled.</b></p>"
 msgstr ""
 "<p><b>Veri tabanı sürücüsü bulunamadı. SQL veri tabanı desteği kapatıldı.</"
 "b></p>"
@@ -1258,6 +1253,26 @@ msgstr ""
 msgid "Expression: "
 msgstr "İfade: "
 
+#: tdeactionmap.cpp:91
+msgid "Action Map"
+msgstr ""
+
+#: tdeactionmap.cpp:95
+msgid "Find and execute actions."
+msgstr ""
+
+#: tdeactionmap.cpp:116
+msgid "Action"
+msgstr ""
+
+#: tdeactionmap.cpp:117
+msgid "Shortcut"
+msgstr ""
+
+#: tdeactionmap.cpp:118 tokendialog.cpp:142 tokendialog.cpp:177
+msgid "Description"
+msgstr "Açıklama"
+
 #: kbarcode.cpp:51
 msgid "Barcode &Generator..."
 msgstr "&Barkod Üreteci..."
@@ -1290,193 +1305,203 @@ msgstr "&Müşterileri Düzenle"
 msgid "&Edit Customer Text"
 msgstr "Müşteri Metnini &Düzenle"
 
-#: kbarcode.cpp:180
+#: kbarcode.cpp:179
+#, fuzzy
 msgid ""
 "%1 is no valid output format for --output. Valid values are POSTSCRIPT, "
-"IMAGE or BARCODE."
-msgstr "%1 --çıktısı için geçerli bir çıktı biçimi değil. Geçerli değerler, POSTSCRIPT, IMAGE veya BARCODE'dur."
+"IMAGE and BARCODE."
+msgstr ""
+"%1 --çıktısı için geçerli bir çıktı biçimi değil. Geçerli değerler, "
+"POSTSCRIPT, IMAGE veya BARCODE'dur."
 
-#: label.cpp:188 propertywidget.cpp:227
+#: label.cpp:188
 msgid "Static"
 msgstr "Sabit"
 
-#: labeleditor.cpp:355
+#: labeleditor.cpp:351
 msgid "Select Label"
 msgstr "Etiket Seçin"
 
-#: labeleditor.cpp:392
+#: labeleditor.cpp:388
 msgid ""
 "<qt>The file <b>%1</b> cannot be loaded as the label definition is missing.</"
 "qt>"
-msgstr "<qt><b>%1</b> dosyası kayıp olduğu için etiket tanım dosyası olarak yüklenemedi.</qt>"
+msgstr ""
+"<qt><b>%1</b> dosyası kayıp olduğu için etiket tanım dosyası olarak "
+"yüklenemedi.</qt>"
 
-#: labeleditor.cpp:451
+#: labeleditor.cpp:447
 msgid "Close &Label"
 msgstr "Etiketi &Kapat"
 
-#: labeleditor.cpp:453
+#: labeleditor.cpp:449
 msgid "&Recent Files"
 msgstr "&Sık Kullanılan Dosyalar"
 
-#: labeleditor.cpp:455
+#: labeleditor.cpp:451
 msgid "&Import and Print Batch File..."
 msgstr "İçe &Aktar ve Toplu İşlem Dosyasını Yazdır..."
 
-#: labeleditor.cpp:459
+#: labeleditor.cpp:455
 msgid "&Change description..."
 msgstr "Açıklamayı &değiştir..."
 
-#: labeleditor.cpp:460
+#: labeleditor.cpp:456
 msgid "&Delete Object"
 msgstr "Nesneyi &Sil"
 
-#: labeleditor.cpp:463
+#: labeleditor.cpp:459
 msgid "Print to &Barcode Printer..."
 msgstr "&Barkod Yazıcıda Yazdır..."
 
-#: labeleditor.cpp:464
+#: labeleditor.cpp:460
 msgid "Print to &Image..."
 msgstr "&Resim olarak Yazdır..."
 
-#: labeleditor.cpp:465
+#: labeleditor.cpp:461
 msgid "&Change Label..."
 msgstr "Etiketi &Değiştir..."
 
-#: labeleditor.cpp:466
+#: labeleditor.cpp:462
 msgid "Insert &Barcode"
 msgstr "&Barkod Ekle"
 
-#: labeleditor.cpp:469
+#: labeleditor.cpp:465
 msgid "Insert &Picture"
 msgstr "&Resim Ekle"
 
-#: labeleditor.cpp:470
+#: labeleditor.cpp:466
 msgid "Insert &Text"
 msgstr "&Metin Ekle"
 
-#: labeleditor.cpp:471 multilineeditdlg.cpp:138 textlineedit.cpp:98
+#: labeleditor.cpp:467 multilineeditdlg.cpp:138 textlineedit.cpp:98
 msgid "Insert &Data Field"
 msgstr "&Veri Alanı Ekle"
 
-#: labeleditor.cpp:472
+#: labeleditor.cpp:468
 msgid "Insert &Text Line"
 msgstr "&Metin Satırı Ekle"
 
-#: labeleditor.cpp:473
+#: labeleditor.cpp:469
 msgid "Insert &Line"
 msgstr "&Çizgi Ekle"
 
-#: labeleditor.cpp:474
+#: labeleditor.cpp:470
 msgid "Insert &Rectangle"
 msgstr "&Dörtgen Ekle"
 
-#: labeleditor.cpp:475
+#: labeleditor.cpp:471
 msgid "Insert &Ellipse"
 msgstr "&Elips Ekle"
 
-#: labeleditor.cpp:477
+#: labeleditor.cpp:473
 msgid "&Grid"
 msgstr "&Izgara"
 
-#: labeleditor.cpp:478
+#: labeleditor.cpp:474
 msgid "&Preview..."
 msgstr "Ö&ngörünüm..."
 
-#: labeleditor.cpp:485
+#: labeleditor.cpp:481
 msgid "Address&book"
 msgstr "Adres &defteri"
 
-#: labeleditor.cpp:486
+#: labeleditor.cpp:482
 msgid "&Create Single Barcode..."
 msgstr "Tek Barkod &Oluştur..."
 
-#: labeleditor.cpp:529
+#: labeleditor.cpp:525
 msgid "T&ools"
 msgstr "&Araçlar"
 
-#: labeleditor.cpp:589
+#: labeleditor.cpp:585
 msgid "&On Top"
 msgstr "Ü&stte"
 
-#: labeleditor.cpp:590
+#: labeleditor.cpp:586
 msgid "&Raise"
 msgstr "Çı&kık"
 
-#: labeleditor.cpp:591
+#: labeleditor.cpp:587
 msgid "&Lower"
 msgstr "&Gömülü"
 
-#: labeleditor.cpp:592
+#: labeleditor.cpp:588
 msgid "&To Background"
 msgstr "&Arka fonda"
 
-#: labeleditor.cpp:595
+#: labeleditor.cpp:591
 msgid "Center &Horizontally"
 msgstr "&Yatay Ortala"
 
-#: labeleditor.cpp:596
+#: labeleditor.cpp:592
 msgid "Center &Vertically"
 msgstr "&Düşey Ortala"
 
-#: labeleditor.cpp:598
+#: labeleditor.cpp:594
 msgid "&Order"
 msgstr "&Sıra"
 
-#: labeleditor.cpp:599
+#: labeleditor.cpp:595
 msgid "&Center"
 msgstr "&Ortala"
 
-#: labeleditor.cpp:602
+#: labeleditor.cpp:598
 msgid "&Protect Position and Size"
 msgstr "Konum ve Boyutu &Koru"
 
-#: labeleditor.cpp:604
+#: labeleditor.cpp:600
 msgid "&Properties"
 msgstr "&Seçenekler"
 
-#: labeleditor.cpp:682
+#: labeleditor.cpp:678
 msgid "Label Description"
 msgstr "Etiket Açıklaması"
 
-#: labeleditor.cpp:683
+#: labeleditor.cpp:679
 msgid "Please enter a description:"
 msgstr "Lütfen bir açıklama girin:"
 
-#: labeleditor.cpp:712
+#: labeleditor.cpp:708
 msgid "Size: "
 msgstr "Boyut: "
 
-#: labeleditor.cpp:715
+#: labeleditor.cpp:711
 msgid "Label Template: "
 msgstr "Etiket Şablonu: "
 
-#: labeleditor.cpp:746
+#: labeleditor.cpp:742
 msgid "Protected Item"
 msgstr "Korunmuş Öğe"
 
-#: labeleditor.cpp:845
+#: labeleditor.cpp:841
 msgid "Spellchecking"
 msgstr "Yazım denetimi"
 
-#: labeleditor.cpp:1019
+#: labeleditor.cpp:1015
 msgid "The file %1 does not exist."
 msgstr "%1 dosyası bulunamadı."
 
-#: labeleditor.cpp:1054
-msgid "<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
+#: labeleditor.cpp:1050
+msgid ""
+"<qt>The document has been modified.<br><br>Do you want to save it ?</qt>"
 msgstr "<qt>Belge değiştirilmiş.<br><br>Kaydetmek istiyor musunuz?</qt>"
 
 #: main.cpp:35
 msgid ""
 "Load the file in KBarcode (if --batch is specified, the file will be used in "
 "batchprinting mode)"
-msgstr "Dosyayı KBarcode'a yükle (eğer --batch tanımlıysa, dosya, toplu yazdırma kipinde kullanılacaktır)"
+msgstr ""
+"Dosyayı KBarcode'a yükle (eğer --batch tanımlıysa, dosya, toplu yazdırma "
+"kipinde kullanılacaktır)"
 
 #: main.cpp:36
 msgid ""
 "Print any loaded files immediately on the default printer or on the printer "
 "specified by the --printer commandline option and exit afterwards"
-msgstr "Yüklenen herhangi bir dosyayı öntanımlı yazıcıda veya --printer komut satırı seçeneği ile belirtilen yazıcıda yazdır ve ardından çık"
+msgstr ""
+"Yüklenen herhangi bir dosyayı öntanımlı yazıcıda veya --printer komut satırı "
+"seçeneği ile belirtilen yazıcıda yazdır ve ardından çık"
 
 #: main.cpp:38
 msgid "Printer/destination to print on"
@@ -1514,7 +1539,9 @@ msgstr "Kullanılacak seri numarasını ayarlayın"
 msgid ""
 "Increase a previously specified serial number using this value for each "
 "printed label"
-msgstr "Her basılan etiket için, bu değeri kullanarak, önceden belirlenen seri numarasını arttır"
+msgstr ""
+"Her basılan etiket için, bu değeri kullanarak, önceden belirlenen seri "
+"numarasını arttır"
 
 #: main.cpp:47
 msgid "Print <value> labels without any data"
@@ -1529,8 +1556,9 @@ msgid "Import variable data from a specified csv file"
 msgstr "Belirlenen bir csv dosyasından veri değişkeni içe aktar"
 
 #: main.cpp:75
-msgid "Kbarcode"
-msgstr "Kbarcode"
+#, fuzzy
+msgid "KBarcode"
+msgstr "Barkod"
 
 #: main.cpp:76
 msgid "KBarcode is a barcode and label printing application for TDE."
@@ -1656,10 +1684,6 @@ msgstr "Sağa &Hizala"
 msgid "&Justify"
 msgstr "&Yasla"
 
-#: mybarcode.cpp:85
-msgid "Barcode not valid!"
-msgstr "Barkod geçerli değil!"
-
 #: mycanvasview.cpp:152
 msgid "Position: "
 msgstr "Konum: "
@@ -1876,91 +1900,91 @@ msgstr "Kırpma işaretlerini &yazdır (kenarlar)"
 msgid "Image Saved in KBarcode"
 msgstr "KBarcode'de Saklanan Resimler"
 
-#: propertywidget.cpp:88
+#: propertywidget.cpp:90
 msgid "&Border Visible"
 msgstr "Görünür &Çerçeve"
 
-#: propertywidget.cpp:99 propertywidget.cpp:188 rectsettingsdlg.cpp:159
+#: propertywidget.cpp:101 propertywidget.cpp:190 rectsettingsdlg.cpp:159
 msgid "Color:"
 msgstr "Renk:"
 
-#: propertywidget.cpp:101 rectsettingsdlg.cpp:161
+#: propertywidget.cpp:103 rectsettingsdlg.cpp:161
 msgid "Line Width:"
 msgstr "Çizgi Kalınlığı:"
 
-#: propertywidget.cpp:103 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
+#: propertywidget.cpp:105 rectsettingsdlg.cpp:81 rectsettingsdlg.cpp:163
 msgid "Line Style:"
 msgstr "Çizgi Biçemi:"
 
-#: propertywidget.cpp:143 propertywidget.cpp:482
+#: propertywidget.cpp:145 propertywidget.cpp:485
 msgid "90"
 msgstr "90"
 
-#: propertywidget.cpp:144 propertywidget.cpp:483
+#: propertywidget.cpp:146 propertywidget.cpp:486
 msgid "180"
 msgstr "180"
 
-#: propertywidget.cpp:145 propertywidget.cpp:484
+#: propertywidget.cpp:147 propertywidget.cpp:487
 msgid "270"
 msgstr "270"
 
-#: propertywidget.cpp:210
+#: propertywidget.cpp:212
 msgid "Barcode Settings:"
 msgstr "Barkod Ayarları:"
 
-#: propertywidget.cpp:343
+#: propertywidget.cpp:346
 msgid "&Protect item from being moved or resized"
 msgstr "Taşıma veya boyutlandırmaya karşı öğeyi &koru"
 
-#: propertywidget.cpp:354
+#: propertywidget.cpp:357
 msgid "&Top:"
 msgstr "Üs&t:"
 
-#: propertywidget.cpp:355
+#: propertywidget.cpp:358
 msgid "&Left:"
 msgstr "So&l:"
 
-#: propertywidget.cpp:356
+#: propertywidget.cpp:359
 msgid "&Height:"
 msgstr "&Yükseklik:"
 
-#: propertywidget.cpp:357
+#: propertywidget.cpp:360
 msgid "&Width:"
 msgstr "&Genişlik:"
 
-#: propertywidget.cpp:468
+#: propertywidget.cpp:471
 msgid "&Load image from path"
 msgstr "Dosya yolundan resim &yükle"
 
-#: propertywidget.cpp:472
+#: propertywidget.cpp:475
 msgid "&Read image path from expression"
 msgstr "İfadeden resim yolunu &oku"
 
-#: propertywidget.cpp:486
+#: propertywidget.cpp:489
 msgid "&Size"
 msgstr "&Boyut"
 
-#: propertywidget.cpp:488
+#: propertywidget.cpp:491
 msgid "&None"
 msgstr "&Yok"
 
-#: propertywidget.cpp:490
+#: propertywidget.cpp:493
 msgid "S&cale"
 msgstr "&Oran"
 
-#: propertywidget.cpp:492
+#: propertywidget.cpp:495
 msgid "Mirror &Horizontaly"
 msgstr "Karşıt &Yataylık"
 
-#: propertywidget.cpp:493
+#: propertywidget.cpp:496
 msgid "Mirror &Vertically"
 msgstr "Karşıt &Düşeylik"
 
-#: propertywidget.cpp:519
+#: propertywidget.cpp:522
 msgid "Image format not supported for file: %1"
 msgstr "Resim biçemi dosya için desteklenmiyor: %1"
 
-#: propertywidget.cpp:608
+#: propertywidget.cpp:611
 msgid "Evaluate JavsScript code to define the visibility of this item:"
 msgstr "Bu öğenin görünürlüğünü belirlemek için JavaScript kodunu değerlendir:"
 
@@ -2012,51 +2036,58 @@ msgstr "Tabloları yeniden oluşturacağız "
 msgid "' and '"
 msgstr "' ve '"
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<qt>Can't create database "
 msgstr "<qt>Veri tabanı oluşturulamıyor "
 
-#: sqltables.cpp:161
+#: sqltables.cpp:164
 msgid "<br>You can continue if the database exists already.</qt>"
 msgstr "<br>Veri tabanı zaten mevcutsa devam edebilirsiniz.</qt>"
 
-#: sqltables.cpp:178
-msgid "KBarcode could not create the required database. Please create it manually."
+#: sqltables.cpp:182
+msgid ""
+"KBarcode could not create the required database. Please create it manually."
 msgstr "KBarcode gerekli veri tabanını oluşturamadı. Lütfen el ile oluşturun."
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid "Created table "
 msgstr "Oluşturulan tablo "
 
-#: sqltables.cpp:260
+#: sqltables.cpp:264
 msgid " successfully!"
 msgstr " başarılı!"
 
-#: sqltables.cpp:264
+#: sqltables.cpp:268
 msgid "Can't connect to database."
 msgstr "Veri tabanına bağlanılamıyor."
 
-#: sqltables.cpp:273
+#: sqltables.cpp:277
 msgid "We are going to delete the complete table: "
 msgstr "Bütün tabloyu sileceğiz: "
 
-#: sqltables.cpp:295
+#: sqltables.cpp:299
 msgid "We are going to delete the complete tables: "
 msgstr "Bütün tabloları sileceğiz: "
 
-#: sqltables.cpp:313
+#: sqltables.cpp:315
+msgid ""
+"Data file for import not found. Continuing without importing data. Please "
+"check your KBarcode installation."
+msgstr ""
+
+#: sqltables.cpp:320
 msgid "SQL import progress:"
 msgstr "SQL aktarma durumu:"
 
-#: sqltables.cpp:324
+#: sqltables.cpp:331
 msgid "Can't open the data file containing the label definitions."
 msgstr "Etiket tanımlamalarının tutulduğu veri dosyası açılamadı."
 
-#: sqltables.cpp:333
+#: sqltables.cpp:340
 msgid "<qt>Can't execute command:<br><b>"
 msgstr "<qt>Komut çalıştırılamadı:<br><b>"
 
-#: sqltables.cpp:425
+#: sqltables.cpp:432
 msgid ""
 "The SQL tables of KBarcode have changed since the last version. KBarcode "
 "updated them without any loss of data."
@@ -2064,43 +2095,43 @@ msgstr ""
 "Son sürümden bu yana KBarcode SQL tabloları değişti. KBarcode, herhangi bir "
 "veri kaybı olmadan bunları güncelleyecek."
 
-#: sqltables.cpp:447
+#: sqltables.cpp:453 sqltables.cpp:473
 msgid "Connected successfully to your database"
 msgstr "Veri tabanınıza başarıyla bağlanıldı"
 
-#: sqltables.cpp:491
+#: sqltables.cpp:517
 msgid "Database Settings"
 msgstr "Veri tabanı Seçenekleri"
 
-#: sqltables.cpp:501
+#: sqltables.cpp:527
 msgid "Username :"
 msgstr "Kullanıcı adı :"
 
-#: sqltables.cpp:508
+#: sqltables.cpp:534
 msgid "Password :"
 msgstr "Parola :"
 
-#: sqltables.cpp:516
+#: sqltables.cpp:542
 msgid "Database :"
 msgstr "Veri tabanı :"
 
-#: sqltables.cpp:523
+#: sqltables.cpp:549
 msgid "Host :"
 msgstr "Alan :"
 
-#: sqltables.cpp:530
+#: sqltables.cpp:556
 msgid "Driver :"
 msgstr "Sürücü :"
 
-#: sqltables.cpp:543
+#: sqltables.cpp:569
 msgid "&Autoconnect on program start"
 msgstr "Program başladığında &otomatik bağlan"
 
-#: sqltables.cpp:547
+#: sqltables.cpp:573
 msgid "&Test Settings"
 msgstr "Seçenekleri &Dene"
 
-#: sqltables.cpp:551
+#: sqltables.cpp:577
 msgid "<b>You have to test your database settings before you can procede.</b>"
 msgstr "<b>Kabul etmeden önce veri tabanı seçeneklerinizi denemelisiniz.</b>"
 
@@ -2180,10 +2211,6 @@ msgstr "&Simge:"
 msgid "Token"
 msgstr "Simge"
 
-#: tokendialog.cpp:142 tokendialog.cpp:177
-msgid "Description"
-msgstr "Açıklama"
-
 #: tokendialog.cpp:146
 msgid "&Custom Expression to be inserted in the token."
 msgstr "Simgeye eklenecek olan öz&el ifade."
@@ -2193,7 +2220,10 @@ msgid ""
 "<qt>Certain tokens, like for exaple the sqlquery token need arguments. In "
 "the case of the sqlquery token, the sure has to enter a sql query in this "
 "text field.</qt>"
-msgstr "<qt>sqlquery simgesi gibi bazı simgeler, değere ihtiyaç duyarlar. sqlquery simgesinin için, bu metin alanına bir sql sorgusu girildiğinden emin olunmalıdır.</qt>"
+msgstr ""
+"<qt>sqlquery simgesi gibi bazı simgeler, değere ihtiyaç duyarlar. sqlquery "
+"simgesinin için, bu metin alanına bir sql sorgusu girildiğinden emin "
+"olunmalıdır.</qt>"
 
 #: tokendialog.cpp:191
 msgid "&Create a new custom variable"
@@ -2207,7 +2237,9 @@ msgstr "Varolan bir özel değişken &ekle"
 msgid ""
 "<qt><b>No SQL connection found!</b><br>You can build a query, but you will "
 "not be able to execute or test it right now.<br></qt>"
-msgstr "<qt><b>SQL bağlantısı bulunamadı!</b><br>Sorguyu inşa edebilirsiniz, fakat şu anda çalıştıramayacak veya deneyemeyeceksiniz.<br></qt>"
+msgstr ""
+"<qt><b>SQL bağlantısı bulunamadı!</b><br>Sorguyu inşa edebilirsiniz, fakat "
+"şu anda çalıştıramayacak veya deneyemeyeceksiniz.<br></qt>"
 
 #: tokendialog.cpp:224
 msgid "&SQL Query:"
@@ -2461,7 +2493,7 @@ msgstr "Tam E-Posta"
 msgid "Formatted Address"
 msgstr "Biçimlendirilmiş Adres"
 
-#: tokenprovider.cpp:813
+#: tokenprovider.cpp:825
 msgid "ERROR: Empty SQL Query"
 msgstr "HATA: Boş SQL Sorgusu"
 
@@ -2474,3 +2506,73 @@ msgstr ""
 "<br>Lütfen kullanılan etiket tanımlamalarının doğruluğunu kontrol edin:"
 "<br><b>"
 
+#~ msgid "Australian Post"
+#~ msgstr "Australian Post"
+
+#~ msgid "Code 11"
+#~ msgstr "Code 11"
+
+#~ msgid "Code 2 of 5"
+#~ msgstr "Code 2 of 5"
+
+#~ msgid "EAN 2"
+#~ msgstr "EAN 2"
+
+#~ msgid "EAN 5"
+#~ msgstr "EAN 5"
+
+#~ msgid "Interleaved 2 of 5"
+#~ msgstr "Interleaved 2 of 5"
+
+#~ msgid "ISBN"
+#~ msgstr "ISBN"
+
+#~ msgid "Kix (Dutch Postal)"
+#~ msgstr "Kix (Dutch Postal)"
+
+#~ msgid "Postnet"
+#~ msgstr "Postnet"
+
+#~ msgid "Rationalized Codabar"
+#~ msgstr "Rationalized Codabar"
+
+#~ msgid "Royal Mail"
+#~ msgstr "Royal Mail"
+
+#~ msgid "Symbol"
+#~ msgstr "Symbol"
+
+#~ msgid "UPCA"
+#~ msgstr "UPCA"
+
+#~ msgid "UPCE"
+#~ msgstr "UPCE"
+
+#~ msgid "Barcode Cache"
+#~ msgstr "Barkod Önbelleği"
+
+#~ msgid "Barcode Cache Size:"
+#~ msgstr "Barkod Önbellek Boyutu:"
+
+#~ msgid "&Clear"
+#~ msgstr "&Temizle"
+
+#~ msgid ""
+#~ "<qt>Specifies how many barcodes should be cached on the harddisk.If you "
+#~ "print lot's of articles, you should set this to be the same as the number "
+#~ "of articles in your database to get best speed results.One cached barcode "
+#~ "requires about 20kb of diskspace.</qt>"
+#~ msgstr ""
+#~ "<qt>Kaç adet barkodun disk üzerinde önbellekleneceğini belirtir. Birçok "
+#~ "madde yazdırıyorsanız, en iyi hız sonucunu elde etmek için bunu, "
+#~ "veritabanınızdaki madde sayısı olarak ayarlamalısınız. Bir adet "
+#~ "önbelleklenmiş barkod, yaklaşık 20 Kb disk alanı gerektirir.</qt>"
+
+#~ msgid "Address Import"
+#~ msgstr "Adres İçe Aktarma"
+
+#~ msgid "Kbarcode"
+#~ msgstr "Kbarcode"
+
+#~ msgid "Barcode not valid!"
+#~ msgstr "Barkod geçerli değil!"