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, 444 insertions, 410 deletions

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!"