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

1 files changed, 430 insertions, 402 deletions

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 <antonv@postikaista.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -27,46 +27,46 @@ msgid ""
 "Your emails"
 msgstr "antonv@postikaista.net"
 
-#: 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"