diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index dabbe9a3..2dd3c2a3 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -26,6 +26,9 @@
      (jtag_LDADD): Add -ltap and -lflash one more time to resolve
        undefined references.
 
+   * po/POTFILES.in: Update according to the changes above.
+   * po/fr.po, po/rw.po, po/sk.po: Update.
+
 2008-03-14  Arnim Laeuger  <arniml@users.sourceforge.net>
 
    * configure.ac: format AC_ARG_ENABLE help with AS_HELP_STRING macro
diff --git a/jtag/po/POTFILES.in b/jtag/po/POTFILES.in
index 3569f6ba..e19393f9 100644
--- a/jtag/po/POTFILES.in
+++ b/jtag/po/POTFILES.in
@@ -24,6 +24,7 @@ src/bus/ppc405ep.c
 src/bus/ppc440gx_ebc8.c
 src/bus/prototype.c
 src/bus/pxa2x0.c
+src/bus/readmem.c
 src/bus/s3c4510x.c
 src/bus/sa1110.c
 src/bus/sh7727.c
@@ -32,6 +33,7 @@ src/bus/sh7751r.c
 src/bus/sharc21065l.c
 src/bus/slsup3.c
 src/bus/tx4925.c
+src/bus/writemem.c
 src/bus/zefant-xs3.c
 src/cmd/bit.c
 src/cmd/bsdl.c
@@ -52,6 +54,7 @@ src/cmd/help.c
 src/cmd/include.c
 src/cmd/initbus.c
 src/cmd/instruction.c
+src/cmd/parse.c
 src/cmd/part.c
 src/cmd/peekpoke.c
 src/cmd/print.c
@@ -68,13 +71,11 @@ src/cmd/signal.c
 src/cmd/svf.c
 src/cmd/test.c
 src/cmd/writemem.c
-src/detect.c
-src/discovery.c
 src/flash/amd.c
 src/flash/amd_flash.c
-src/flash.c
 src/flash/cfi.c
 src/flash/detectflash.c
+src/flash/flash.c
 src/flash/intel.c
 src/flash/jedec.c
 src/flash/jedec_exp.c
@@ -90,7 +91,6 @@ src/part/data_register.c
 src/part/instruction.c
 src/part/part.c
 src/part/signal.c
-src/readmem.c
 src/svf/svf_bison.c
 src/svf/svf.c
 src/svf/svf_flex.c
@@ -116,6 +116,8 @@ src/tap/cable/wiggler2.c
 src/tap/cable/wiggler.c
 src/tap/cable/xpc.c
 src/tap/chain.c
+src/tap/detect.c
+src/tap/discovery.c
 src/tap/parport.c
 src/tap/parport/direct.c
 src/tap/parport/ftd2xx.c
@@ -127,4 +129,3 @@ src/tap/state.c
 src/tap/tap.c
 src/tap/usbconn.c
 src/tap/usbconn/libusb.c
-src/writemem.c
diff --git a/jtag/po/fr.po b/jtag/po/fr.po
index 4526c49d..28b59fe6 100644
--- a/jtag/po/fr.po
+++ b/jtag/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU jtag 0.5.1\n"
 "Report-Msgid-Bugs-To: marcel@telka.sk\n"
-"POT-Creation-Date: 2008-03-13 20:47+0100\n"
+"POT-Creation-Date: 2008-03-15 12:05+0800\n"
 "PO-Revision-Date: 2004-05-10 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -182,7 +182,7 @@ msgstr ""
 msgid "IDCODE mismatch\n"
 msgstr ""
 
-#: src/bsdl/bsdl.c:293 src/detect.c:361
+#: src/bsdl/bsdl.c:293 src/tap/detect.c:361
 #, c-format
 msgid "  Filename:     %s\n"
 msgstr "  nom de fichier:     %s\n"
@@ -358,9 +358,9 @@ msgstr ""
 msgid "Blackfin BF561 EZ-KIT board bus driver"
 msgstr ""
 
-#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/scan.c:88
-#: src/cmd/shell.c:62 src/detect.c:269 src/jtag.c:181 src/jtag.c:469
-#: src/jtag.c:488 src/jtag.c:513 src/tap/usbconn/libusb.c:152
+#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/parse.c:72
+#: src/cmd/scan.c:88 src/cmd/shell.c:62 src/jtag.c:383 src/jtag.c:402
+#: src/jtag.c:427 src/tap/detect.c:269 src/tap/usbconn/libusb.c:152
 #, c-format
 msgid "Out of memory\n"
 msgstr "Mémoire épuisée\n"
@@ -431,7 +431,7 @@ msgstr ""
 #: src/bus/fjmem.c:391 src/bus/fjmem.c:406 src/bus/fjmem.c:487
 #: src/bus/fjmem.c:493 src/bus/fjmem.c:595 src/cmd/instruction.c:95
 #: src/cmd/register.c:71 src/cmd/register.c:85 src/cmd/salias.c:72
-#: src/cmd/signal.c:88 src/detect.c:210 src/detect.c:233
+#: src/cmd/signal.c:88 src/tap/detect.c:210 src/tap/detect.c:233
 #, c-format
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
@@ -681,6 +681,57 @@ msgstr "pilote de bus compatible Intel PXA2x0 via BSR"
 msgid "Intel PXA27x compatible bus driver via BSR"
 msgstr "pilote de bus compatible Intel PXA2x0 via BSR"
 
+#: src/bus/readmem.c:55 src/bus/writemem.c:49 src/flash/detectflash.c:56
+#, c-format
+msgid "Error: Missing bus driver!\n"
+msgstr "Erreur: pilote de bus manquant!\n"
+
+#: src/bus/readmem.c:62 src/bus/writemem.c:56
+#, c-format
+msgid "Error: Bus width detection failed\n"
+msgstr "ERREUR: détection de la largeur de bus a échoué\n"
+
+#: src/bus/readmem.c:68 src/bus/writemem.c:62
+#, c-format
+msgid "Unknown bus width!\n"
+msgstr "Largeur de bus inconnu!\n"
+
+#: src/bus/readmem.c:75 src/bus/writemem.c:69
+#, c-format
+msgid "address: 0x%08X\n"
+msgstr "adresse: 0x%08X\n"
+
+#: src/bus/readmem.c:76 src/bus/writemem.c:70
+#, c-format
+msgid "length:  0x%08X\n"
+msgstr "longueur:  0x%08X\n"
+
+#: src/bus/readmem.c:79 src/bus/writemem.c:73
+#, c-format
+msgid "length is 0.\n"
+msgstr "longeur est 0.\n"
+
+#: src/bus/readmem.c:85
+#, c-format
+msgid "reading:\n"
+msgstr "lecture en cours:\n"
+
+#: src/bus/readmem.c:105 src/bus/writemem.c:87 src/flash/flash.c:160
+#: src/flash/flash.c:200
+#, c-format
+msgid "addr: 0x%08X"
+msgstr "adr: 0x%08X"
+
+#: src/bus/readmem.c:113 src/bus/writemem.c:122 src/flash/flash.c:215
+#: src/flash/flash.c:354
+#, c-format
+msgid ""
+"\n"
+"Done.\n"
+msgstr ""
+"\n"
+"Complété.\n"
+
 #: src/bus/s3c4510x.c:151
 #, fuzzy, c-format
 msgid ""
@@ -785,6 +836,31 @@ msgstr "pilote de bus compatible Intel IXP425 via BSR (JTAG No de pi
 msgid "Toshiba TX4925 compatible bus driver via BSR"
 msgstr "pilote de bus compatible Intel IXP425 via BSR"
 
+#: src/bus/writemem.c:79
+#, fuzzy, c-format
+msgid "writing:\n"
+msgstr "lecture en cours:\n"
+
+#: src/bus/writemem.c:91
+#, c-format
+msgid "Data not on word boundary, NOT SUPPORTED!"
+msgstr ""
+
+#: src/bus/writemem.c:93
+#, fuzzy, c-format
+msgid "Unexpected end of file!\n"
+msgstr "ERREUR: fin prématurée du fichier\n"
+
+#: src/bus/writemem.c:94
+#, fuzzy, c-format
+msgid "Addr: 0x%08X\n"
+msgstr "adr: 0x%08X\n"
+
+#: src/bus/writemem.c:99
+#, c-format
+msgid "Short read: bc=0x%X\n"
+msgstr ""
+
 #: src/bus/zefant-xs3.c:252
 #, fuzzy, c-format
 msgid ""
@@ -1200,7 +1276,7 @@ msgstr ""
 msgid "erase flash memory by number of blocks"
 msgstr "effacer la mémoire flash par numéro de bloc"
 
-#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:476
+#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:390
 #, c-format
 msgid "Unable to open file `%s'!\n"
 msgstr "Incapable d'ouvrir le fichier `%s'!\n"
@@ -1915,111 +1991,6 @@ msgstr ""
 msgid "write content of file to the memory"
 msgstr ""
 
-#: src/detect.c:58
-#, c-format
-msgid "Cannot open %s\n"
-msgstr "ne peut ouvrir %s\n"
-
-#: src/detect.c:205
-#, c-format
-msgid "IR length: %d\n"
-msgstr "longueur IR: %d\n"
-
-#: src/detect.c:221
-#, c-format
-msgid "Unable to detect JTAG chain length\n"
-msgstr "Incapable de détecter la longueur de la chaîne JTAG\n"
-
-#: src/detect.c:224
-#, c-format
-msgid "Chain length: %d\n"
-msgstr "Longueur de la chaîne: %d\n"
-
-#: src/detect.c:265
-#, fuzzy, c-format
-msgid "Device Id: %s (0x%016lX)\n"
-msgstr "Identificateur du périphérique: %s\n"
-
-#: src/detect.c:293
-#, c-format
-msgid "  Unknown manufacturer!\n"
-msgstr "  Manufacturier inconnu!\n"
-
-#: src/detect.c:299
-#, c-format
-msgid "  Manufacturer: %s\n"
-msgstr "  Manufacturier: %s\n"
-
-#: src/detect.c:301
-#, c-format
-msgid "Warning: Manufacturer too long\n"
-msgstr "AVERTISSEMENT: nom du manufacturier trop long\n"
-
-#: src/detect.c:317
-#, c-format
-msgid "  Unknown part!\n"
-msgstr "  Pièce inconnue!\n"
-
-#: src/detect.c:323
-#, fuzzy, c-format
-msgid "  Part(%d):         %s\n"
-msgstr "  Pièce:         %s\n"
-
-#: src/detect.c:325
-#, c-format
-msgid "Warning: Part too long\n"
-msgstr "AVERTISSEMENT: nom de pièce trop long\n"
-
-#: src/detect.c:341
-#, c-format
-msgid "  Unknown stepping!\n"
-msgstr "  Pas inconnu!\n"
-
-#: src/detect.c:347
-#, c-format
-msgid "  Stepping:     %s\n"
-msgstr "  Pas     :     %s\n"
-
-#: src/detect.c:349
-#, c-format
-msgid "Warning: Stepping too long\n"
-msgstr "AVERTISSEMENT: pas trop long\n"
-
-#: src/detect.c:379
-#, c-format
-msgid "Error: Unable to detect JTAG chain end!\n"
-msgstr "ERREUR: incapable de détecter la fin de la chaîne JTAG!\n"
-
-#: src/discovery.c:100
-#, c-format
-msgid "Warning: TDO seems to be stuck at %d\n"
-msgstr ""
-
-#: src/discovery.c:125
-#, c-format
-msgid "Detecting IR length ... "
-msgstr "Détection de la longuer IR..."
-
-#: src/discovery.c:131 src/discovery.c:163
-#, c-format
-msgid "%d\n"
-msgstr "%d\n"
-
-#: src/discovery.c:134
-#, c-format
-msgid "Error: Invalid IR length!\n"
-msgstr "ERREUR: longueur IR invalide!\n"
-
-#: src/discovery.c:145
-#, c-format
-msgid "Error: Out of memory!\n"
-msgstr "ERREUR: mémoire épuisée!\n"
-
-#: src/discovery.c:157
-#, c-format
-msgid "Detecting DR length for IR %s ... "
-msgstr "Détection de la longeur DR de IR %s..."
-
 #: src/flash/amd.c:276
 #, c-format
 msgid ""
@@ -2169,270 +2140,95 @@ msgstr "AMD/Fujitsu Jeu standard de commandes"
 msgid "supported: AMD 29LV040B, 29C040B, 1x8 Bit"
 msgstr "supportés: AMD 29LV800B; 1x16 Bit"
 
-#: src/flash.c:89
+#: src/flash/detectflash.c:87
 #, c-format
-msgid "unknown flash - vendor id: %d (0x%04x)\n"
-msgstr "flahs inconnu - identificateur du manufacturier: %d (0x%04x)\n"
+msgid "Flash not found!\n"
+msgstr "Flash non détecté!\n"
 
-#: src/flash.c:93
+#: src/flash/detectflash.c:96
 #, c-format
-msgid "Flash not supported!\n"
-msgstr "Flash non supporté!\n"
+msgid "Query identification string:\n"
+msgstr "Chaîne de requêtre d'identification:\n"
 
-#: src/flash.c:104 src/flash.c:256 src/flash.c:368
-#, c-format
-msgid "no flash driver found\n"
-msgstr "aucun pilote de flahs repéré\n"
+#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
+msgid "null"
+msgstr "nul"
 
-#: src/flash.c:115
-#, c-format
-msgid "Invalid sync sequence!\n"
-msgstr "Séquence de synchro invalide!\n"
+#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
+msgid "Intel/Sharp Extended Command Set"
+msgstr "Jeu étendu de commandes Intel/Sharp"
 
-#: src/flash.c:133
-#, c-format
-msgid "block %d unlocked\n"
-msgstr "bloc %d déverrouillé\n"
+#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
+#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
+msgid "Intel Standard Command Set"
+msgstr "Jeu standard de commandes Intel"
 
-#: src/flash.c:134 src/flash.c:290
-#, c-format
-msgid "erasing block %d: %d\n"
-msgstr "effacement du bloc %d: %d\n"
+#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
+msgid "AMD/Fujitsu Extended Command Set"
+msgstr "Jeu étendu de commandes AMD/Fujitsu"
 
-#: src/flash.c:138 src/flash.c:275
-#, c-format
-msgid "program:\n"
-msgstr "programme:\n"
+#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
+msgid "Mitsubishi Standard Command Set"
+msgstr "Jeu standard de commandes Mitsubishi"
 
-#: src/flash.c:146 src/flash.c:186
-#, c-format
-msgid "Error: premature end of file\n"
-msgstr "ERREUR: fin prématurée du fichier\n"
+#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
+msgid "Mitsubishi Extended Command Set"
+msgstr "Jeu étendu de commandes Mitsubishi"
 
-#: src/flash.c:149 src/flash.c:189
-#, c-format
-msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
-msgstr "enregistrement: début = 0x%08X, longueur = 0x%08X, checksum = 0x%08X\n"
+#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
+msgid "Page Write Command Set"
+msgstr "Jeu de commande d'écriture de page"
 
-#: src/flash.c:153 src/flash.c:193
-#, c-format
-msgid "Error: Invalid record length!\n"
-msgstr "ERREUR: longueur de l'enregistrement invalide!\n"
+#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
+#: src/flash/detectflash.c:198
+msgid "unknown!!!"
+msgstr "inconnu!!!"
 
-#: src/flash.c:160 src/flash.c:200 src/readmem.c:105 src/writemem.c:87
+#: src/flash/detectflash.c:127
 #, c-format
-msgid "addr: 0x%08X"
-msgstr "adr: 0x%08X"
+msgid ""
+"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
+msgstr ""
+"\tJeu de commandes Primary Algorithm et Code ID de contrôle d'interface: 0x%"
+"04X (%s)\n"
 
-#: src/flash.c:165 src/flash.c:309
+#: src/flash/detectflash.c:157
 #, c-format
 msgid ""
-"\n"
-"flash error\n"
+"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
+"s)\n"
 msgstr ""
-"\n"
-"erreur flash\n"
+"\tJeu alternatif de commandes Primary Algorithm et Code ID de contrôle "
+"d'interface: 0x%04X (%s)\n"
 
-#: src/flash.c:177 src/flash.c:320
+#: src/flash/detectflash.c:160
 #, c-format
-msgid "verify:\n"
-msgstr "vérifier:\n"
+msgid "Query system interface information:\n"
+msgstr "Requête d'information d'interface système:\n"
 
-#: src/flash.c:206
+#: src/flash/detectflash.c:161
 #, c-format
-msgid ""
-"\n"
-"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
+msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
 msgstr ""
-"\n"
-"ERREUR de vérification: 0x%08X vs. 0x%08X à l'adresse %08X\n"
+"\tVcc logique Puissance minimum Écri/Efface ou Voltage d'écriture: %d mV\n"
 
-#: src/flash.c:215 src/flash.c:354 src/readmem.c:113 src/writemem.c:122
+#: src/flash/detectflash.c:162
 #, c-format
-msgid ""
-"\n"
-"Done.\n"
+msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
 msgstr ""
-"\n"
-"Complété.\n"
+"\tVcc logique Puissance maximum Écri/Efface ou Voltage d'écriture: %d mV\n"
 
-#: src/flash.c:269
+#: src/flash/detectflash.c:163
 #, c-format
-msgid "Out of memory!\n"
-msgstr "Mémoire épuisée!\n"
+msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
+msgstr ""
+"\tVpp [Programmation] puissance minimum Écriture/Efface voltage: %d mV\n"
 
-#: src/flash.c:289
+#: src/flash/detectflash.c:164
 #, c-format
-msgid ""
-"\n"
-"block %d unlocked\n"
+msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
 msgstr ""
-"\n"
-"bloc %d déverrouillé\n"
-
-#: src/flash.c:297 src/flash.c:344
-#, fuzzy, c-format
-msgid "addr: 0x%08X\r"
-msgstr "adr: 0x%08X"
-
-#: src/flash.c:332
-#, c-format
-msgid "Error during file read.\n"
-msgstr "ERREUR durant la lecture du fichier.\n"
-
-#: src/flash.c:349
-#, fuzzy, c-format
-msgid ""
-"\n"
-"verify error:\n"
-"read: 0x%08X\n"
-"expected: 0x%08X\n"
-msgstr ""
-"\n"
-"ERREUR de vérification:\n"
-"lu: 0x%08X\n"
-"attendu: 0x%08X\n"
-
-#: src/flash.c:373
-#, c-format
-msgid ""
-"\n"
-"Erasing %d Flash block%s from address 0x%x\n"
-msgstr ""
-
-#: src/flash.c:378
-#, c-format
-msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
-msgstr ""
-
-#: src/flash.c:381
-#, c-format
-msgid "Erasing ... "
-msgstr ""
-
-#: src/flash.c:386
-#, c-format
-msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
-msgstr ""
-
-#: src/flash.c:388
-#, c-format
-msgid "Ok.\r%78s\r"
-msgstr ""
-
-#: src/flash.c:391
-#, c-format
-msgid "ERROR.\n"
-msgstr ""
-
-#: src/flash.c:397
-#, c-format
-msgid ""
-"\n"
-"Erasing Completed.\n"
-msgstr ""
-
-#: src/flash.c:399
-#, c-format
-msgid ""
-"\n"
-"Erasing Failed.\n"
-msgstr ""
-
-#: src/flash/detectflash.c:56 src/readmem.c:55 src/writemem.c:49
-#, c-format
-msgid "Error: Missing bus driver!\n"
-msgstr "Erreur: pilote de bus manquant!\n"
-
-#: src/flash/detectflash.c:87
-#, c-format
-msgid "Flash not found!\n"
-msgstr "Flash non détecté!\n"
-
-#: src/flash/detectflash.c:96
-#, c-format
-msgid "Query identification string:\n"
-msgstr "Chaîne de requêtre d'identification:\n"
-
-#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
-msgid "null"
-msgstr "nul"
-
-#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
-msgid "Intel/Sharp Extended Command Set"
-msgstr "Jeu étendu de commandes Intel/Sharp"
-
-#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
-#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
-msgid "Intel Standard Command Set"
-msgstr "Jeu standard de commandes Intel"
-
-#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
-msgid "AMD/Fujitsu Extended Command Set"
-msgstr "Jeu étendu de commandes AMD/Fujitsu"
-
-#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
-msgid "Mitsubishi Standard Command Set"
-msgstr "Jeu standard de commandes Mitsubishi"
-
-#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
-msgid "Mitsubishi Extended Command Set"
-msgstr "Jeu étendu de commandes Mitsubishi"
-
-#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
-msgid "Page Write Command Set"
-msgstr "Jeu de commande d'écriture de page"
-
-#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
-#: src/flash/detectflash.c:198
-msgid "unknown!!!"
-msgstr "inconnu!!!"
-
-#: src/flash/detectflash.c:127
-#, c-format
-msgid ""
-"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
-msgstr ""
-"\tJeu de commandes Primary Algorithm et Code ID de contrôle d'interface: 0x%"
-"04X (%s)\n"
-
-#: src/flash/detectflash.c:157
-#, c-format
-msgid ""
-"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
-"s)\n"
-msgstr ""
-"\tJeu alternatif de commandes Primary Algorithm et Code ID de contrôle "
-"d'interface: 0x%04X (%s)\n"
-
-#: src/flash/detectflash.c:160
-#, c-format
-msgid "Query system interface information:\n"
-msgstr "Requête d'information d'interface système:\n"
-
-#: src/flash/detectflash.c:161
-#, c-format
-msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
-msgstr ""
-"\tVcc logique Puissance minimum Écri/Efface ou Voltage d'écriture: %d mV\n"
-
-#: src/flash/detectflash.c:162
-#, c-format
-msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
-msgstr ""
-"\tVcc logique Puissance maximum Écri/Efface ou Voltage d'écriture: %d mV\n"
-
-#: src/flash/detectflash.c:163
-#, c-format
-msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
-msgstr ""
-"\tVpp [Programmation] puissance minimum Écriture/Efface voltage: %d mV\n"
-
-#: src/flash/detectflash.c:164
-#, c-format
-msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
-msgstr ""
-"\tVpp [Programmation] puissance maximum Écriture/Efface voltage: %d mV\n"
+"\tVpp [Programmation] puissance maximum Écriture/Efface voltage: %d mV\n"
 
 #: src/flash/detectflash.c:165
 #, c-format
@@ -2812,6 +2608,162 @@ msgstr ""
 msgid "\t\tBank%d: %d sectors\n"
 msgstr ""
 
+#: src/flash/flash.c:89
+#, c-format
+msgid "unknown flash - vendor id: %d (0x%04x)\n"
+msgstr "flahs inconnu - identificateur du manufacturier: %d (0x%04x)\n"
+
+#: src/flash/flash.c:93
+#, c-format
+msgid "Flash not supported!\n"
+msgstr "Flash non supporté!\n"
+
+#: src/flash/flash.c:104 src/flash/flash.c:256 src/flash/flash.c:368
+#, c-format
+msgid "no flash driver found\n"
+msgstr "aucun pilote de flahs repéré\n"
+
+#: src/flash/flash.c:115
+#, c-format
+msgid "Invalid sync sequence!\n"
+msgstr "Séquence de synchro invalide!\n"
+
+#: src/flash/flash.c:133
+#, c-format
+msgid "block %d unlocked\n"
+msgstr "bloc %d déverrouillé\n"
+
+#: src/flash/flash.c:134 src/flash/flash.c:290
+#, c-format
+msgid "erasing block %d: %d\n"
+msgstr "effacement du bloc %d: %d\n"
+
+#: src/flash/flash.c:138 src/flash/flash.c:275
+#, c-format
+msgid "program:\n"
+msgstr "programme:\n"
+
+#: src/flash/flash.c:146 src/flash/flash.c:186
+#, c-format
+msgid "Error: premature end of file\n"
+msgstr "ERREUR: fin prématurée du fichier\n"
+
+#: src/flash/flash.c:149 src/flash/flash.c:189
+#, c-format
+msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
+msgstr "enregistrement: début = 0x%08X, longueur = 0x%08X, checksum = 0x%08X\n"
+
+#: src/flash/flash.c:153 src/flash/flash.c:193
+#, c-format
+msgid "Error: Invalid record length!\n"
+msgstr "ERREUR: longueur de l'enregistrement invalide!\n"
+
+#: src/flash/flash.c:165 src/flash/flash.c:309
+#, c-format
+msgid ""
+"\n"
+"flash error\n"
+msgstr ""
+"\n"
+"erreur flash\n"
+
+#: src/flash/flash.c:177 src/flash/flash.c:320
+#, c-format
+msgid "verify:\n"
+msgstr "vérifier:\n"
+
+#: src/flash/flash.c:206
+#, c-format
+msgid ""
+"\n"
+"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
+msgstr ""
+"\n"
+"ERREUR de vérification: 0x%08X vs. 0x%08X à l'adresse %08X\n"
+
+#: src/flash/flash.c:269
+#, c-format
+msgid "Out of memory!\n"
+msgstr "Mémoire épuisée!\n"
+
+#: src/flash/flash.c:289
+#, c-format
+msgid ""
+"\n"
+"block %d unlocked\n"
+msgstr ""
+"\n"
+"bloc %d déverrouillé\n"
+
+#: src/flash/flash.c:297 src/flash/flash.c:344
+#, fuzzy, c-format
+msgid "addr: 0x%08X\r"
+msgstr "adr: 0x%08X"
+
+#: src/flash/flash.c:332
+#, c-format
+msgid "Error during file read.\n"
+msgstr "ERREUR durant la lecture du fichier.\n"
+
+#: src/flash/flash.c:349
+#, fuzzy, c-format
+msgid ""
+"\n"
+"verify error:\n"
+"read: 0x%08X\n"
+"expected: 0x%08X\n"
+msgstr ""
+"\n"
+"ERREUR de vérification:\n"
+"lu: 0x%08X\n"
+"attendu: 0x%08X\n"
+
+#: src/flash/flash.c:373
+#, c-format
+msgid ""
+"\n"
+"Erasing %d Flash block%s from address 0x%x\n"
+msgstr ""
+
+#: src/flash/flash.c:378
+#, c-format
+msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
+msgstr ""
+
+#: src/flash/flash.c:381
+#, c-format
+msgid "Erasing ... "
+msgstr ""
+
+#: src/flash/flash.c:386
+#, c-format
+msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
+msgstr ""
+
+#: src/flash/flash.c:388
+#, c-format
+msgid "Ok.\r%78s\r"
+msgstr ""
+
+#: src/flash/flash.c:391
+#, c-format
+msgid "ERROR.\n"
+msgstr ""
+
+#: src/flash/flash.c:397
+#, c-format
+msgid ""
+"\n"
+"Erasing Completed.\n"
+msgstr ""
+
+#: src/flash/flash.c:399
+#, c-format
+msgid ""
+"\n"
+"Erasing Failed.\n"
+msgstr ""
+
 #: src/flash/intel.c:104
 #, c-format
 msgid "Manufacturer: %s\n"
@@ -2869,57 +2821,57 @@ msgstr "support
 msgid "supported: 28Fxxxx, 1 x 8 bit"
 msgstr "supportés: 28Fxxxx, 1 x 8 bit"
 
-#: src/jtag.c:356
+#: src/jtag.c:270
 #, c-format
 msgid "'%s' must not be run suid root!\n"
 msgstr ""
 
-#: src/jtag.c:417
+#: src/jtag.c:331
 #, fuzzy, c-format
 msgid "%s #%s\n"
 msgstr "%-13s %s\n"
 
-#: src/jtag.c:420
+#: src/jtag.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]\n"
 msgstr ""
 
-#: src/jtag.c:423
+#: src/jtag.c:337
 #, c-format
 msgid "  -h, --help          display this help and exit\n"
 msgstr ""
 
-#: src/jtag.c:424
+#: src/jtag.c:338
 #, c-format
 msgid "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#: src/jtag.c:426
+#: src/jtag.c:340
 #, c-format
 msgid "  -n, --norc          disable reading ~/.jtag/rc on startup\n"
 msgstr ""
 
-#: src/jtag.c:427
+#: src/jtag.c:341
 #, c-format
 msgid "  -i, --interactive   enter interactive mode after reading files\n"
 msgstr ""
 
-#: src/jtag.c:428
+#: src/jtag.c:342
 #, c-format
 msgid "  -q, --quiet         Do not print help on startup\n"
 msgstr ""
 
-#: src/jtag.c:430
+#: src/jtag.c:344
 #, c-format
 msgid "  [FILE]              file containing commands to execute\n"
 msgstr ""
 
-#: src/jtag.c:433
+#: src/jtag.c:347
 #, c-format
 msgid "  Please report bugs at http://www.urjtag.org\n"
 msgstr ""
 
-#: src/jtag.c:440
+#: src/jtag.c:354
 #, c-format
 msgid ""
 "\n"
@@ -2929,7 +2881,7 @@ msgid ""
 "Copyright (C) 2007, 2008 Kolja Waschk and the respective authors\n"
 msgstr ""
 
-#: src/jtag.c:445
+#: src/jtag.c:359
 #, c-format
 msgid ""
 "\n"
@@ -2948,7 +2900,7 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/jtag.c:502
+#: src/jtag.c:416
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2979,7 +2931,7 @@ msgstr ""
 "avec ce programme; sinon, écrire à la Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/jtag.c:518
+#: src/jtag.c:432
 #, fuzzy, c-format
 msgid "WARNING: %s may damage your hardware!\n"
 msgstr ""
@@ -2987,7 +2939,7 @@ msgstr ""
 "quitter!\n"
 "\n"
 
-#: src/jtag.c:519
+#: src/jtag.c:433
 #, fuzzy, c-format
 msgid ""
 "Type \"quit\" to exit, \"help\" for help.\n"
@@ -3030,36 +2982,6 @@ msgstr "%%-%ds %%-%ds %%-%ds %%-%ds %%-%ds\n"
 msgid "(none)"
 msgstr "(aucun)"
 
-#: src/readmem.c:62 src/writemem.c:56
-#, c-format
-msgid "Error: Bus width detection failed\n"
-msgstr "ERREUR: détection de la largeur de bus a échoué\n"
-
-#: src/readmem.c:68 src/writemem.c:62
-#, c-format
-msgid "Unknown bus width!\n"
-msgstr "Largeur de bus inconnu!\n"
-
-#: src/readmem.c:75 src/writemem.c:69
-#, c-format
-msgid "address: 0x%08X\n"
-msgstr "adresse: 0x%08X\n"
-
-#: src/readmem.c:76 src/writemem.c:70
-#, c-format
-msgid "length:  0x%08X\n"
-msgstr "longueur:  0x%08X\n"
-
-#: src/readmem.c:79 src/writemem.c:73
-#, c-format
-msgid "length is 0.\n"
-msgstr "longeur est 0.\n"
-
-#: src/readmem.c:85
-#, c-format
-msgid "reading:\n"
-msgstr "lecture en cours:\n"
-
 #: src/svf/svf.c:375 src/svf/svf.c:546 src/svf/svf.c:863 src/svf/svf.c:867
 #, fuzzy, c-format
 msgid "out of memory"
@@ -3458,6 +3380,111 @@ msgstr "%s(%d) pi
 msgid "%s(%d) Part %d without data register\n"
 msgstr "%s(%d) pièce %d sans registre de données\n"
 
+#: src/tap/detect.c:58
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "ne peut ouvrir %s\n"
+
+#: src/tap/detect.c:205
+#, c-format
+msgid "IR length: %d\n"
+msgstr "longueur IR: %d\n"
+
+#: src/tap/detect.c:221
+#, c-format
+msgid "Unable to detect JTAG chain length\n"
+msgstr "Incapable de détecter la longueur de la chaîne JTAG\n"
+
+#: src/tap/detect.c:224
+#, c-format
+msgid "Chain length: %d\n"
+msgstr "Longueur de la chaîne: %d\n"
+
+#: src/tap/detect.c:265
+#, fuzzy, c-format
+msgid "Device Id: %s (0x%016lX)\n"
+msgstr "Identificateur du périphérique: %s\n"
+
+#: src/tap/detect.c:293
+#, c-format
+msgid "  Unknown manufacturer!\n"
+msgstr "  Manufacturier inconnu!\n"
+
+#: src/tap/detect.c:299
+#, c-format
+msgid "  Manufacturer: %s\n"
+msgstr "  Manufacturier: %s\n"
+
+#: src/tap/detect.c:301
+#, c-format
+msgid "Warning: Manufacturer too long\n"
+msgstr "AVERTISSEMENT: nom du manufacturier trop long\n"
+
+#: src/tap/detect.c:317
+#, c-format
+msgid "  Unknown part!\n"
+msgstr "  Pièce inconnue!\n"
+
+#: src/tap/detect.c:323
+#, fuzzy, c-format
+msgid "  Part(%d):         %s\n"
+msgstr "  Pièce:         %s\n"
+
+#: src/tap/detect.c:325
+#, c-format
+msgid "Warning: Part too long\n"
+msgstr "AVERTISSEMENT: nom de pièce trop long\n"
+
+#: src/tap/detect.c:341
+#, c-format
+msgid "  Unknown stepping!\n"
+msgstr "  Pas inconnu!\n"
+
+#: src/tap/detect.c:347
+#, c-format
+msgid "  Stepping:     %s\n"
+msgstr "  Pas     :     %s\n"
+
+#: src/tap/detect.c:349
+#, c-format
+msgid "Warning: Stepping too long\n"
+msgstr "AVERTISSEMENT: pas trop long\n"
+
+#: src/tap/detect.c:379
+#, c-format
+msgid "Error: Unable to detect JTAG chain end!\n"
+msgstr "ERREUR: incapable de détecter la fin de la chaîne JTAG!\n"
+
+#: src/tap/discovery.c:100
+#, c-format
+msgid "Warning: TDO seems to be stuck at %d\n"
+msgstr ""
+
+#: src/tap/discovery.c:125
+#, c-format
+msgid "Detecting IR length ... "
+msgstr "Détection de la longuer IR..."
+
+#: src/tap/discovery.c:131 src/tap/discovery.c:163
+#, c-format
+msgid "%d\n"
+msgstr "%d\n"
+
+#: src/tap/discovery.c:134
+#, c-format
+msgid "Error: Invalid IR length!\n"
+msgstr "ERREUR: longueur IR invalide!\n"
+
+#: src/tap/discovery.c:145
+#, c-format
+msgid "Error: Out of memory!\n"
+msgstr "ERREUR: mémoire épuisée!\n"
+
+#: src/tap/discovery.c:157
+#, c-format
+msgid "Detecting DR length for IR %s ... "
+msgstr "Détection de la longeur DR de IR %s..."
+
 #: src/tap/parport/direct.c:167 src/tap/parport/ftd2xx.c:155
 #: src/tap/parport/ftdi.c:155 src/tap/parport/ppdev.c:119
 #: src/tap/parport/ppi.c:115
@@ -3543,31 +3570,6 @@ msgstr "Initialisation de %s sur le port ppdev %s\n"
 msgid "%s: Invalid state: %2X\n"
 msgstr "%s: état invalide: %2X\n"
 
-#: src/writemem.c:79
-#, fuzzy, c-format
-msgid "writing:\n"
-msgstr "lecture en cours:\n"
-
-#: src/writemem.c:91
-#, c-format
-msgid "Data not on word boundary, NOT SUPPORTED!"
-msgstr ""
-
-#: src/writemem.c:93
-#, fuzzy, c-format
-msgid "Unexpected end of file!\n"
-msgstr "ERREUR: fin prématurée du fichier\n"
-
-#: src/writemem.c:94
-#, fuzzy, c-format
-msgid "Addr: 0x%08X\n"
-msgstr "adr: 0x%08X\n"
-
-#: src/writemem.c:99
-#, c-format
-msgid "Short read: bc=0x%X\n"
-msgstr ""
-
 #, fuzzy
 #~ msgid "Disconnecting %s, device %s\n"
 #~ msgstr "Déconnexion de %s du port ppdev %s\n"
diff --git a/jtag/po/rw.po b/jtag/po/rw.po
index 9d2b3b1f..0e6df23a 100644
--- a/jtag/po/rw.po
+++ b/jtag/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jtag 0.5.1\n"
 "Report-Msgid-Bugs-To: marcel@telka.sk\n"
-"POT-Creation-Date: 2008-03-13 20:47+0100\n"
+"POT-Creation-Date: 2008-03-15 12:05+0800\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -190,7 +190,7 @@ msgstr ""
 msgid "IDCODE mismatch\n"
 msgstr ""
 
-#: src/bsdl/bsdl.c:293 src/detect.c:361
+#: src/bsdl/bsdl.c:293 src/tap/detect.c:361
 #, fuzzy, c-format
 msgid "  Filename:     %s\n"
 msgstr "Izina ry'idosiye:"
@@ -360,9 +360,9 @@ msgstr "Musomyi: Biturutse"
 msgid "Blackfin BF561 EZ-KIT board bus driver"
 msgstr ""
 
-#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/scan.c:88
-#: src/cmd/shell.c:62 src/detect.c:269 src/jtag.c:181 src/jtag.c:469
-#: src/jtag.c:488 src/jtag.c:513 src/tap/usbconn/libusb.c:152
+#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/parse.c:72
+#: src/cmd/scan.c:88 src/cmd/shell.c:62 src/jtag.c:383 src/jtag.c:402
+#: src/jtag.c:427 src/tap/detect.c:269 src/tap/usbconn/libusb.c:152
 #, fuzzy, c-format
 msgid "Out of memory\n"
 msgstr "Bya"
@@ -433,7 +433,7 @@ msgstr ""
 #: src/bus/fjmem.c:391 src/bus/fjmem.c:406 src/bus/fjmem.c:487
 #: src/bus/fjmem.c:493 src/bus/fjmem.c:595 src/cmd/instruction.c:95
 #: src/cmd/register.c:71 src/cmd/register.c:85 src/cmd/salias.c:72
-#: src/cmd/signal.c:88 src/detect.c:210 src/detect.c:233
+#: src/cmd/signal.c:88 src/tap/detect.c:210 src/tap/detect.c:233
 #, fuzzy, c-format
 msgid "out of memory\n"
 msgstr "Inyuma Bya"
@@ -683,6 +683,55 @@ msgstr "Musomyi: Biturutse"
 msgid "Intel PXA27x compatible bus driver via BSR"
 msgstr "Musomyi: Biturutse"
 
+#: src/bus/readmem.c:55 src/bus/writemem.c:49 src/flash/detectflash.c:56
+#, fuzzy, c-format
+msgid "Error: Missing bus driver!\n"
+msgstr "Musomyi:"
+
+#: src/bus/readmem.c:62 src/bus/writemem.c:56
+#, fuzzy, c-format
+msgid "Error: Bus width detection failed\n"
+msgstr "Ubugari"
+
+#: src/bus/readmem.c:68 src/bus/writemem.c:62
+#, fuzzy, c-format
+msgid "Unknown bus width!\n"
+msgstr "Ubugari"
+
+#: src/bus/readmem.c:75 src/bus/writemem.c:69
+#, fuzzy, c-format
+msgid "address: 0x%08X\n"
+msgstr "Aderesi"
+
+#: src/bus/readmem.c:76 src/bus/writemem.c:70
+#, fuzzy, c-format
+msgid "length:  0x%08X\n"
+msgstr "Uburebure"
+
+#: src/bus/readmem.c:79 src/bus/writemem.c:73
+#, fuzzy, c-format
+msgid "length is 0.\n"
+msgstr "Uburebure ni 0"
+
+#: src/bus/readmem.c:85
+#, c-format
+msgid "reading:\n"
+msgstr ""
+
+#: src/bus/readmem.c:105 src/bus/writemem.c:87 src/flash/flash.c:160
+#: src/flash/flash.c:200
+#, fuzzy, c-format
+msgid "addr: 0x%08X"
+msgstr "Aderesi"
+
+#: src/bus/readmem.c:113 src/bus/writemem.c:122 src/flash/flash.c:215
+#: src/flash/flash.c:354
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Done.\n"
+msgstr "Byakozwe."
+
 #: src/bus/s3c4510x.c:151
 #, fuzzy, c-format
 msgid ""
@@ -788,6 +837,31 @@ msgstr "Musomyi: Biturutse"
 msgid "Toshiba TX4925 compatible bus driver via BSR"
 msgstr "Musomyi: Biturutse"
 
+#: src/bus/writemem.c:79
+#, c-format
+msgid "writing:\n"
+msgstr ""
+
+#: src/bus/writemem.c:91
+#, c-format
+msgid "Data not on word boundary, NOT SUPPORTED!"
+msgstr ""
+
+#: src/bus/writemem.c:93
+#, fuzzy, c-format
+msgid "Unexpected end of file!\n"
+msgstr "Impera Bya"
+
+#: src/bus/writemem.c:94
+#, fuzzy, c-format
+msgid "Addr: 0x%08X\n"
+msgstr "Aderesi"
+
+#: src/bus/writemem.c:99
+#, c-format
+msgid "Short read: bc=0x%X\n"
+msgstr ""
+
 #: src/bus/zefant-xs3.c:252
 #, fuzzy, c-format
 msgid ""
@@ -1172,7 +1246,7 @@ msgstr "%s%s"
 msgid "erase flash memory by number of blocks"
 msgstr "Umurabyo Ububiko ku Umubare Bya"
 
-#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:476
+#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:390
 #, fuzzy, c-format
 msgid "Unable to open file `%s'!\n"
 msgstr "Kuri Gufungura IDOSIYE"
@@ -1797,112 +1871,6 @@ msgstr ""
 msgid "write content of file to the memory"
 msgstr ""
 
-#: src/detect.c:58
-#, fuzzy, c-format
-msgid "Cannot open %s\n"
-msgstr "Gufungura"
-
-#: src/detect.c:205
-#, fuzzy, c-format
-msgid "IR length: %d\n"
-msgstr "Uburebure"
-
-#: src/detect.c:221
-#, fuzzy, c-format
-msgid "Unable to detect JTAG chain length\n"
-msgstr "Kuri"
-
-#: src/detect.c:224
-#, fuzzy, c-format
-msgid "Chain length: %d\n"
-msgstr "Uburebure"
-
-#: src/detect.c:265
-#, c-format
-msgid "Device Id: %s (0x%016lX)\n"
-msgstr ""
-
-#: src/detect.c:293
-#, fuzzy, c-format
-msgid "  Unknown manufacturer!\n"
-msgstr "Ukora mu nganda"
-
-#: src/detect.c:299
-#, fuzzy, c-format
-msgid "  Manufacturer: %s\n"
-msgstr "Ukora mu nganda"
-
-#: src/detect.c:301
-#, c-format
-msgid "Warning: Manufacturer too long\n"
-msgstr ""
-
-#: src/detect.c:317
-#, c-format
-msgid "  Unknown part!\n"
-msgstr ""
-
-#: src/detect.c:323
-#, c-format
-msgid "  Part(%d):         %s\n"
-msgstr ""
-
-#: src/detect.c:325
-#, c-format
-msgid "Warning: Part too long\n"
-msgstr ""
-
-#: src/detect.c:341
-#, c-format
-msgid "  Unknown stepping!\n"
-msgstr ""
-
-#: src/detect.c:347
-#, c-format
-msgid "  Stepping:     %s\n"
-msgstr ""
-
-#: src/detect.c:349
-#, c-format
-msgid "Warning: Stepping too long\n"
-msgstr ""
-
-#: src/detect.c:379
-#, fuzzy, c-format
-msgid "Error: Unable to detect JTAG chain end!\n"
-msgstr "Kuri Impera"
-
-#: src/discovery.c:100
-#, c-format
-msgid "Warning: TDO seems to be stuck at %d\n"
-msgstr ""
-
-#: src/discovery.c:125
-#, fuzzy, c-format
-msgid "Detecting IR length ... "
-msgstr "Uburebure"
-
-# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
-#: src/discovery.c:131 src/discovery.c:163
-#, fuzzy, c-format
-msgid "%d\n"
-msgstr "%d"
-
-#: src/discovery.c:134
-#, fuzzy, c-format
-msgid "Error: Invalid IR length!\n"
-msgstr "Uburebure"
-
-#: src/discovery.c:145
-#, fuzzy, c-format
-msgid "Error: Out of memory!\n"
-msgstr "Bya Ububiko"
-
-#: src/discovery.c:157
-#, fuzzy, c-format
-msgid "Detecting DR length for IR %s ... "
-msgstr "Uburebure kugirango"
-
 #: src/flash/amd.c:276
 #, c-format
 msgid ""
@@ -2042,266 +2010,102 @@ msgstr ""
 msgid "supported: AMD 29LV040B, 29C040B, 1x8 Bit"
 msgstr ""
 
-#: src/flash.c:89
+#: src/flash/detectflash.c:87
 #, fuzzy, c-format
-msgid "unknown flash - vendor id: %d (0x%04x)\n"
-msgstr "Kitazwi Umurabyo Umucuruzi ID"
+msgid "Flash not found!\n"
+msgstr "OYA Byabonetse"
 
-#: src/flash.c:93
+#: src/flash/detectflash.c:96
 #, fuzzy, c-format
-msgid "Flash not supported!\n"
-msgstr "OYA"
+msgid "Query identification string:\n"
+msgstr "irangamimerere Ikurikiranyanyuguti"
 
-#: src/flash.c:104 src/flash.c:256 src/flash.c:368
-#, fuzzy, c-format
-msgid "no flash driver found\n"
-msgstr "Oya Umurabyo Musomyi:"
+#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
+#, fuzzy
+msgid "null"
+msgstr "NTAGIHARI"
 
-#: src/flash.c:115
-#, c-format
-msgid "Invalid sync sequence!\n"
+#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
+msgid "Intel/Sharp Extended Command Set"
 msgstr ""
 
-#: src/flash.c:133
-#, fuzzy, c-format
-msgid "block %d unlocked\n"
-msgstr "Funga"
+#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
+#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
+msgid "Intel Standard Command Set"
+msgstr ""
 
-#: src/flash.c:134 src/flash.c:290
-#, fuzzy, c-format
-msgid "erasing block %d: %d\n"
-msgstr "Funga"
+#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
+msgid "AMD/Fujitsu Extended Command Set"
+msgstr ""
 
-# offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_HELPERPROG.FT_PROGRAM.text
-#: src/flash.c:138 src/flash.c:275
-#, fuzzy, c-format
-msgid "program:\n"
-msgstr "Porogaramu"
+#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
+msgid "Mitsubishi Standard Command Set"
+msgstr ""
+
+#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
+msgid "Mitsubishi Extended Command Set"
+msgstr ""
+
+#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
+msgid "Page Write Command Set"
+msgstr ""
 
-#: src/flash.c:146 src/flash.c:186
+# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_UNKNOWN_APPLICATION.text
+#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
+#: src/flash/detectflash.c:198
+#, fuzzy
+msgid "unknown!!!"
+msgstr "Kitazwi"
+
+#: src/flash/detectflash.c:127
 #, fuzzy, c-format
-msgid "Error: premature end of file\n"
-msgstr "Impera Bya"
+msgid ""
+"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
+msgstr "Na"
 
-#: src/flash.c:149 src/flash.c:189
+#: src/flash/detectflash.c:157
 #, fuzzy, c-format
-msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
-msgstr "Icyabitswe Gutangira LEN"
+msgid ""
+"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
+"s)\n"
+msgstr "Na"
 
-#: src/flash.c:153 src/flash.c:193
+#: src/flash/detectflash.c:160
 #, fuzzy, c-format
-msgid "Error: Invalid record length!\n"
-msgstr "Icyabitswe Uburebure"
+msgid "Query system interface information:\n"
+msgstr "Sisitemu Ibisobanuro"
 
-#: src/flash.c:160 src/flash.c:200 src/readmem.c:105 src/writemem.c:87
+#: src/flash/detectflash.c:161
 #, fuzzy, c-format
-msgid "addr: 0x%08X"
-msgstr "Aderesi"
+msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
+msgstr "Cyangwa"
 
-#: src/flash.c:165 src/flash.c:309
+#: src/flash/detectflash.c:162
 #, fuzzy, c-format
-msgid ""
-"\n"
-"flash error\n"
-msgstr "Umurabyo"
+msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
+msgstr "Cyangwa"
 
-#: src/flash.c:177 src/flash.c:320
+#: src/flash/detectflash.c:163
 #, c-format
-msgid "verify:\n"
+msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
 msgstr ""
 
-#: src/flash.c:206
-#, fuzzy, c-format
-msgid ""
-"\n"
-"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
-msgstr "Ikosa ku Aderesi"
+#: src/flash/detectflash.c:164
+#, c-format
+msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
+msgstr ""
 
-#: src/flash.c:215 src/flash.c:354 src/readmem.c:113 src/writemem.c:122
+#: src/flash/detectflash.c:165
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Done.\n"
-msgstr "Byakozwe."
+msgid "\tTypical timeout per single byte/word program: %d us\n"
+msgstr "Igihe cyarenze: UMWE Bayite ijambo Porogaramu"
 
-#: src/flash.c:269
+#: src/flash/detectflash.c:166
 #, fuzzy, c-format
-msgid "Out of memory!\n"
-msgstr "Ububiko bwarenzwe"
+msgid "\tTypical timeout for maximum-size multi-byte program: %d us\n"
+msgstr "Igihe cyarenze: kugirango Kinini Ingano Bayite Porogaramu"
 
-#: src/flash.c:289
-#, fuzzy, c-format
-msgid ""
-"\n"
-"block %d unlocked\n"
-msgstr "Funga"
-
-#: src/flash.c:297 src/flash.c:344
-#, fuzzy, c-format
-msgid "addr: 0x%08X\r"
-msgstr "Aderesi"
-
-#: src/flash.c:332
-#, fuzzy, c-format
-msgid "Error during file read.\n"
-msgstr "IDOSIYE Gusoma"
-
-#: src/flash.c:349
-#, fuzzy, c-format
-msgid ""
-"\n"
-"verify error:\n"
-"read: 0x%08X\n"
-"expected: 0x%08X\n"
-msgstr "Ikosa Ikitezwe:"
-
-#: src/flash.c:373
-#, c-format
-msgid ""
-"\n"
-"Erasing %d Flash block%s from address 0x%x\n"
-msgstr ""
-
-#: src/flash.c:378
-#, c-format
-msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
-msgstr ""
-
-#: src/flash.c:381
-#, c-format
-msgid "Erasing ... "
-msgstr ""
-
-#: src/flash.c:386
-#, c-format
-msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
-msgstr ""
-
-#: src/flash.c:388
-#, c-format
-msgid "Ok.\r%78s\r"
-msgstr ""
-
-#: src/flash.c:391
-#, c-format
-msgid "ERROR.\n"
-msgstr ""
-
-#: src/flash.c:397
-#, c-format
-msgid ""
-"\n"
-"Erasing Completed.\n"
-msgstr ""
-
-#: src/flash.c:399
-#, c-format
-msgid ""
-"\n"
-"Erasing Failed.\n"
-msgstr ""
-
-#: src/flash/detectflash.c:56 src/readmem.c:55 src/writemem.c:49
-#, fuzzy, c-format
-msgid "Error: Missing bus driver!\n"
-msgstr "Musomyi:"
-
-#: src/flash/detectflash.c:87
-#, fuzzy, c-format
-msgid "Flash not found!\n"
-msgstr "OYA Byabonetse"
-
-#: src/flash/detectflash.c:96
-#, fuzzy, c-format
-msgid "Query identification string:\n"
-msgstr "irangamimerere Ikurikiranyanyuguti"
-
-#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
-#, fuzzy
-msgid "null"
-msgstr "NTAGIHARI"
-
-#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
-msgid "Intel/Sharp Extended Command Set"
-msgstr ""
-
-#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
-#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
-msgid "Intel Standard Command Set"
-msgstr ""
-
-#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
-msgid "AMD/Fujitsu Extended Command Set"
-msgstr ""
-
-#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
-msgid "Mitsubishi Standard Command Set"
-msgstr ""
-
-#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
-msgid "Mitsubishi Extended Command Set"
-msgstr ""
-
-#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
-msgid "Page Write Command Set"
-msgstr ""
-
-# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_UNKNOWN_APPLICATION.text
-#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
-#: src/flash/detectflash.c:198
-#, fuzzy
-msgid "unknown!!!"
-msgstr "Kitazwi"
-
-#: src/flash/detectflash.c:127
-#, fuzzy, c-format
-msgid ""
-"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
-msgstr "Na"
-
-#: src/flash/detectflash.c:157
-#, fuzzy, c-format
-msgid ""
-"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
-"s)\n"
-msgstr "Na"
-
-#: src/flash/detectflash.c:160
-#, fuzzy, c-format
-msgid "Query system interface information:\n"
-msgstr "Sisitemu Ibisobanuro"
-
-#: src/flash/detectflash.c:161
-#, fuzzy, c-format
-msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
-msgstr "Cyangwa"
-
-#: src/flash/detectflash.c:162
-#, fuzzy, c-format
-msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
-msgstr "Cyangwa"
-
-#: src/flash/detectflash.c:163
-#, c-format
-msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
-msgstr ""
-
-#: src/flash/detectflash.c:164
-#, c-format
-msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
-msgstr ""
-
-#: src/flash/detectflash.c:165
-#, fuzzy, c-format
-msgid "\tTypical timeout per single byte/word program: %d us\n"
-msgstr "Igihe cyarenze: UMWE Bayite ijambo Porogaramu"
-
-#: src/flash/detectflash.c:166
-#, fuzzy, c-format
-msgid "\tTypical timeout for maximum-size multi-byte program: %d us\n"
-msgstr "Igihe cyarenze: kugirango Kinini Ingano Bayite Porogaramu"
-
-#: src/flash/detectflash.c:167
+#: src/flash/detectflash.c:167
 #, fuzzy, c-format
 msgid "\tTypical timeout per individual block erase: %d ms\n"
 msgstr "Igihe cyarenze: Funga"
@@ -2661,6 +2465,153 @@ msgstr ""
 msgid "\t\tBank%d: %d sectors\n"
 msgstr ""
 
+#: src/flash/flash.c:89
+#, fuzzy, c-format
+msgid "unknown flash - vendor id: %d (0x%04x)\n"
+msgstr "Kitazwi Umurabyo Umucuruzi ID"
+
+#: src/flash/flash.c:93
+#, fuzzy, c-format
+msgid "Flash not supported!\n"
+msgstr "OYA"
+
+#: src/flash/flash.c:104 src/flash/flash.c:256 src/flash/flash.c:368
+#, fuzzy, c-format
+msgid "no flash driver found\n"
+msgstr "Oya Umurabyo Musomyi:"
+
+#: src/flash/flash.c:115
+#, c-format
+msgid "Invalid sync sequence!\n"
+msgstr ""
+
+#: src/flash/flash.c:133
+#, fuzzy, c-format
+msgid "block %d unlocked\n"
+msgstr "Funga"
+
+#: src/flash/flash.c:134 src/flash/flash.c:290
+#, fuzzy, c-format
+msgid "erasing block %d: %d\n"
+msgstr "Funga"
+
+# offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_HELPERPROG.FT_PROGRAM.text
+#: src/flash/flash.c:138 src/flash/flash.c:275
+#, fuzzy, c-format
+msgid "program:\n"
+msgstr "Porogaramu"
+
+#: src/flash/flash.c:146 src/flash/flash.c:186
+#, fuzzy, c-format
+msgid "Error: premature end of file\n"
+msgstr "Impera Bya"
+
+#: src/flash/flash.c:149 src/flash/flash.c:189
+#, fuzzy, c-format
+msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
+msgstr "Icyabitswe Gutangira LEN"
+
+#: src/flash/flash.c:153 src/flash/flash.c:193
+#, fuzzy, c-format
+msgid "Error: Invalid record length!\n"
+msgstr "Icyabitswe Uburebure"
+
+#: src/flash/flash.c:165 src/flash/flash.c:309
+#, fuzzy, c-format
+msgid ""
+"\n"
+"flash error\n"
+msgstr "Umurabyo"
+
+#: src/flash/flash.c:177 src/flash/flash.c:320
+#, c-format
+msgid "verify:\n"
+msgstr ""
+
+#: src/flash/flash.c:206
+#, fuzzy, c-format
+msgid ""
+"\n"
+"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
+msgstr "Ikosa ku Aderesi"
+
+#: src/flash/flash.c:269
+#, fuzzy, c-format
+msgid "Out of memory!\n"
+msgstr "Ububiko bwarenzwe"
+
+#: src/flash/flash.c:289
+#, fuzzy, c-format
+msgid ""
+"\n"
+"block %d unlocked\n"
+msgstr "Funga"
+
+#: src/flash/flash.c:297 src/flash/flash.c:344
+#, fuzzy, c-format
+msgid "addr: 0x%08X\r"
+msgstr "Aderesi"
+
+#: src/flash/flash.c:332
+#, fuzzy, c-format
+msgid "Error during file read.\n"
+msgstr "IDOSIYE Gusoma"
+
+#: src/flash/flash.c:349
+#, fuzzy, c-format
+msgid ""
+"\n"
+"verify error:\n"
+"read: 0x%08X\n"
+"expected: 0x%08X\n"
+msgstr "Ikosa Ikitezwe:"
+
+#: src/flash/flash.c:373
+#, c-format
+msgid ""
+"\n"
+"Erasing %d Flash block%s from address 0x%x\n"
+msgstr ""
+
+#: src/flash/flash.c:378
+#, c-format
+msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
+msgstr ""
+
+#: src/flash/flash.c:381
+#, c-format
+msgid "Erasing ... "
+msgstr ""
+
+#: src/flash/flash.c:386
+#, c-format
+msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
+msgstr ""
+
+#: src/flash/flash.c:388
+#, c-format
+msgid "Ok.\r%78s\r"
+msgstr ""
+
+#: src/flash/flash.c:391
+#, c-format
+msgid "ERROR.\n"
+msgstr ""
+
+#: src/flash/flash.c:397
+#, c-format
+msgid ""
+"\n"
+"Erasing Completed.\n"
+msgstr ""
+
+#: src/flash/flash.c:399
+#, c-format
+msgid ""
+"\n"
+"Erasing Failed.\n"
+msgstr ""
+
 #: src/flash/intel.c:104
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
@@ -2721,7 +2672,7 @@ msgstr "1. X"
 msgid "supported: 28Fxxxx, 1 x 8 bit"
 msgstr "1. X 8"
 
-#: src/jtag.c:356
+#: src/jtag.c:270
 #, c-format
 msgid "'%s' must not be run suid root!\n"
 msgstr ""
@@ -2729,52 +2680,52 @@ msgstr ""
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: src/jtag.c:417
+#: src/jtag.c:331
 #, fuzzy, c-format
 msgid "%s #%s\n"
 msgstr "%-13s%s"
 
-#: src/jtag.c:420
+#: src/jtag.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]\n"
 msgstr ""
 
-#: src/jtag.c:423
+#: src/jtag.c:337
 #, c-format
 msgid "  -h, --help          display this help and exit\n"
 msgstr ""
 
-#: src/jtag.c:424
+#: src/jtag.c:338
 #, c-format
 msgid "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#: src/jtag.c:426
+#: src/jtag.c:340
 #, c-format
 msgid "  -n, --norc          disable reading ~/.jtag/rc on startup\n"
 msgstr ""
 
-#: src/jtag.c:427
+#: src/jtag.c:341
 #, c-format
 msgid "  -i, --interactive   enter interactive mode after reading files\n"
 msgstr ""
 
-#: src/jtag.c:428
+#: src/jtag.c:342
 #, c-format
 msgid "  -q, --quiet         Do not print help on startup\n"
 msgstr ""
 
-#: src/jtag.c:430
+#: src/jtag.c:344
 #, c-format
 msgid "  [FILE]              file containing commands to execute\n"
 msgstr ""
 
-#: src/jtag.c:433
+#: src/jtag.c:347
 #, c-format
 msgid "  Please report bugs at http://www.urjtag.org\n"
 msgstr ""
 
-#: src/jtag.c:440
+#: src/jtag.c:354
 #, c-format
 msgid ""
 "\n"
@@ -2784,7 +2735,7 @@ msgid ""
 "Copyright (C) 2007, 2008 Kolja Waschk and the respective authors\n"
 msgstr ""
 
-#: src/jtag.c:445
+#: src/jtag.c:359
 #, c-format
 msgid ""
 "\n"
@@ -2803,7 +2754,7 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/jtag.c:502
+#: src/jtag.c:416
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2818,12 +2769,12 @@ msgid ""
 "\n"
 msgstr "%sR. o."
 
-#: src/jtag.c:518
+#: src/jtag.c:432
 #, fuzzy, c-format
 msgid "WARNING: %s may damage your hardware!\n"
 msgstr "Gicurasi Kuvamo Kuri Gusohoka"
 
-#: src/jtag.c:519
+#: src/jtag.c:433
 #, fuzzy, c-format
 msgid ""
 "Type \"quit\" to exit, \"help\" for help.\n"
@@ -2864,36 +2815,6 @@ msgstr ""
 msgid "(none)"
 msgstr "(ntacyo)"
 
-#: src/readmem.c:62 src/writemem.c:56
-#, fuzzy, c-format
-msgid "Error: Bus width detection failed\n"
-msgstr "Ubugari"
-
-#: src/readmem.c:68 src/writemem.c:62
-#, fuzzy, c-format
-msgid "Unknown bus width!\n"
-msgstr "Ubugari"
-
-#: src/readmem.c:75 src/writemem.c:69
-#, fuzzy, c-format
-msgid "address: 0x%08X\n"
-msgstr "Aderesi"
-
-#: src/readmem.c:76 src/writemem.c:70
-#, fuzzy, c-format
-msgid "length:  0x%08X\n"
-msgstr "Uburebure"
-
-#: src/readmem.c:79 src/writemem.c:73
-#, fuzzy, c-format
-msgid "length is 0.\n"
-msgstr "Uburebure ni 0"
-
-#: src/readmem.c:85
-#, c-format
-msgid "reading:\n"
-msgstr ""
-
 #: src/svf/svf.c:375 src/svf/svf.c:546 src/svf/svf.c:863 src/svf/svf.c:867
 #, fuzzy, c-format
 msgid "out of memory"
@@ -3288,6 +3209,112 @@ msgstr "%s(%d)Gikora"
 msgid "%s(%d) Part %d without data register\n"
 msgstr "%s(%d)Ibyatanzwe"
 
+#: src/tap/detect.c:58
+#, fuzzy, c-format
+msgid "Cannot open %s\n"
+msgstr "Gufungura"
+
+#: src/tap/detect.c:205
+#, fuzzy, c-format
+msgid "IR length: %d\n"
+msgstr "Uburebure"
+
+#: src/tap/detect.c:221
+#, fuzzy, c-format
+msgid "Unable to detect JTAG chain length\n"
+msgstr "Kuri"
+
+#: src/tap/detect.c:224
+#, fuzzy, c-format
+msgid "Chain length: %d\n"
+msgstr "Uburebure"
+
+#: src/tap/detect.c:265
+#, c-format
+msgid "Device Id: %s (0x%016lX)\n"
+msgstr ""
+
+#: src/tap/detect.c:293
+#, fuzzy, c-format
+msgid "  Unknown manufacturer!\n"
+msgstr "Ukora mu nganda"
+
+#: src/tap/detect.c:299
+#, fuzzy, c-format
+msgid "  Manufacturer: %s\n"
+msgstr "Ukora mu nganda"
+
+#: src/tap/detect.c:301
+#, c-format
+msgid "Warning: Manufacturer too long\n"
+msgstr ""
+
+#: src/tap/detect.c:317
+#, c-format
+msgid "  Unknown part!\n"
+msgstr ""
+
+#: src/tap/detect.c:323
+#, c-format
+msgid "  Part(%d):         %s\n"
+msgstr ""
+
+#: src/tap/detect.c:325
+#, c-format
+msgid "Warning: Part too long\n"
+msgstr ""
+
+#: src/tap/detect.c:341
+#, c-format
+msgid "  Unknown stepping!\n"
+msgstr ""
+
+#: src/tap/detect.c:347
+#, c-format
+msgid "  Stepping:     %s\n"
+msgstr ""
+
+#: src/tap/detect.c:349
+#, c-format
+msgid "Warning: Stepping too long\n"
+msgstr ""
+
+#: src/tap/detect.c:379
+#, fuzzy, c-format
+msgid "Error: Unable to detect JTAG chain end!\n"
+msgstr "Kuri Impera"
+
+#: src/tap/discovery.c:100
+#, c-format
+msgid "Warning: TDO seems to be stuck at %d\n"
+msgstr ""
+
+#: src/tap/discovery.c:125
+#, fuzzy, c-format
+msgid "Detecting IR length ... "
+msgstr "Uburebure"
+
+# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
+#: src/tap/discovery.c:131 src/tap/discovery.c:163
+#, fuzzy, c-format
+msgid "%d\n"
+msgstr "%d"
+
+#: src/tap/discovery.c:134
+#, fuzzy, c-format
+msgid "Error: Invalid IR length!\n"
+msgstr "Uburebure"
+
+#: src/tap/discovery.c:145
+#, fuzzy, c-format
+msgid "Error: Out of memory!\n"
+msgstr "Bya Ububiko"
+
+#: src/tap/discovery.c:157
+#, fuzzy, c-format
+msgid "Detecting DR length for IR %s ... "
+msgstr "Uburebure kugirango"
+
 #: src/tap/parport/direct.c:167 src/tap/parport/ftd2xx.c:155
 #: src/tap/parport/ftdi.c:155 src/tap/parport/ppdev.c:119
 #: src/tap/parport/ppi.c:115
@@ -3373,31 +3400,6 @@ msgstr "ku Umuyoboro"
 msgid "%s: Invalid state: %2X\n"
 msgstr "%s:Leta"
 
-#: src/writemem.c:79
-#, c-format
-msgid "writing:\n"
-msgstr ""
-
-#: src/writemem.c:91
-#, c-format
-msgid "Data not on word boundary, NOT SUPPORTED!"
-msgstr ""
-
-#: src/writemem.c:93
-#, fuzzy, c-format
-msgid "Unexpected end of file!\n"
-msgstr "Impera Bya"
-
-#: src/writemem.c:94
-#, fuzzy, c-format
-msgid "Addr: 0x%08X\n"
-msgstr "Aderesi"
-
-#: src/writemem.c:99
-#, c-format
-msgid "Short read: bc=0x%X\n"
-msgstr ""
-
 #, fuzzy
 #~ msgid "Disconnecting %s, device %s\n"
 #~ msgstr "Bivuye Umuyoboro"
diff --git a/jtag/po/sk.po b/jtag/po/sk.po
index f5b7b03f..40da44b0 100644
--- a/jtag/po/sk.po
+++ b/jtag/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jtag 0.5.1\n"
 "Report-Msgid-Bugs-To: marcel@telka.sk\n"
-"POT-Creation-Date: 2008-03-13 20:47+0100\n"
+"POT-Creation-Date: 2008-03-15 12:05+0800\n"
 "PO-Revision-Date: 2003-10-08 21:25+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -181,7 +181,7 @@ msgstr ""
 msgid "IDCODE mismatch\n"
 msgstr ""
 
-#: src/bsdl/bsdl.c:293 src/detect.c:361
+#: src/bsdl/bsdl.c:293 src/tap/detect.c:361
 #, c-format
 msgid "  Filename:     %s\n"
 msgstr "  Súbor:     %s\n"
@@ -365,9 +365,9 @@ msgstr ""
 msgid "Blackfin BF561 EZ-KIT board bus driver"
 msgstr ""
 
-#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/scan.c:88
-#: src/cmd/shell.c:62 src/detect.c:269 src/jtag.c:181 src/jtag.c:469
-#: src/jtag.c:488 src/jtag.c:513 src/tap/usbconn/libusb.c:152
+#: src/bus/buses.c:91 src/cmd/include.c:69 src/cmd/parse.c:72
+#: src/cmd/scan.c:88 src/cmd/shell.c:62 src/jtag.c:383 src/jtag.c:402
+#: src/jtag.c:427 src/tap/detect.c:269 src/tap/usbconn/libusb.c:152
 #, c-format
 msgid "Out of memory\n"
 msgstr "Nedostatok pamäte\n"
@@ -440,7 +440,7 @@ msgstr ""
 #: src/bus/fjmem.c:391 src/bus/fjmem.c:406 src/bus/fjmem.c:487
 #: src/bus/fjmem.c:493 src/bus/fjmem.c:595 src/cmd/instruction.c:95
 #: src/cmd/register.c:71 src/cmd/register.c:85 src/cmd/salias.c:72
-#: src/cmd/signal.c:88 src/detect.c:210 src/detect.c:233
+#: src/cmd/signal.c:88 src/tap/detect.c:210 src/tap/detect.c:233
 #, c-format
 msgid "out of memory\n"
 msgstr "nedostatok pamäte\n"
@@ -701,6 +701,57 @@ msgstr "Intel PXA2x0 kompatibilný ovláda� zbernice cez BSR"
 msgid "Intel PXA27x compatible bus driver via BSR"
 msgstr "Intel PXA2x0 kompatibilný ovláda� zbernice cez BSR"
 
+#: src/bus/readmem.c:55 src/bus/writemem.c:49 src/flash/detectflash.c:56
+#, c-format
+msgid "Error: Missing bus driver!\n"
+msgstr "Chyba: Chýba ovláda� zbernice!\n"
+
+#: src/bus/readmem.c:62 src/bus/writemem.c:56
+#, c-format
+msgid "Error: Bus width detection failed\n"
+msgstr "Chyba: Detekcia šírky zbernice zlyhala\n"
+
+#: src/bus/readmem.c:68 src/bus/writemem.c:62
+#, c-format
+msgid "Unknown bus width!\n"
+msgstr "Neznáma šírka zbernice!\n"
+
+#: src/bus/readmem.c:75 src/bus/writemem.c:69
+#, c-format
+msgid "address: 0x%08X\n"
+msgstr "adresa: 0x%08X\n"
+
+#: src/bus/readmem.c:76 src/bus/writemem.c:70
+#, c-format
+msgid "length:  0x%08X\n"
+msgstr "dĺžka:  0x%08X\n"
+
+#: src/bus/readmem.c:79 src/bus/writemem.c:73
+#, c-format
+msgid "length is 0.\n"
+msgstr "dĺžka je 0.\n"
+
+#: src/bus/readmem.c:85
+#, c-format
+msgid "reading:\n"
+msgstr "�ítam:\n"
+
+#: src/bus/readmem.c:105 src/bus/writemem.c:87 src/flash/flash.c:160
+#: src/flash/flash.c:200
+#, c-format
+msgid "addr: 0x%08X"
+msgstr "adresa: 0x%08X"
+
+#: src/bus/readmem.c:113 src/bus/writemem.c:122 src/flash/flash.c:215
+#: src/flash/flash.c:354
+#, c-format
+msgid ""
+"\n"
+"Done.\n"
+msgstr ""
+"\n"
+"Hotovo.\n"
+
 #: src/bus/s3c4510x.c:151
 #, fuzzy, c-format
 msgid ""
@@ -812,6 +863,31 @@ msgstr ""
 msgid "Toshiba TX4925 compatible bus driver via BSR"
 msgstr "Intel IXP425 kompatibilný ovláda� zbernice cez BSR"
 
+#: src/bus/writemem.c:79
+#, fuzzy, c-format
+msgid "writing:\n"
+msgstr "�ítam:\n"
+
+#: src/bus/writemem.c:91
+#, c-format
+msgid "Data not on word boundary, NOT SUPPORTED!"
+msgstr ""
+
+#: src/bus/writemem.c:93
+#, fuzzy, c-format
+msgid "Unexpected end of file!\n"
+msgstr "Chyba: neo�akávaný koniec súboru\n"
+
+#: src/bus/writemem.c:94
+#, fuzzy, c-format
+msgid "Addr: 0x%08X\n"
+msgstr "adresa: 0x%08X\n"
+
+#: src/bus/writemem.c:99
+#, c-format
+msgid "Short read: bc=0x%X\n"
+msgstr ""
+
 #: src/bus/zefant-xs3.c:252
 #, fuzzy, c-format
 msgid ""
@@ -1225,7 +1301,7 @@ msgstr ""
 msgid "erase flash memory by number of blocks"
 msgstr "vymazať pamäť flash podľa po�tu blokov"
 
-#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:476
+#: src/cmd/flashmem.c:57 src/cmd/writemem.c:52 src/jtag.c:390
 #, c-format
 msgid "Unable to open file `%s'!\n"
 msgstr "Nepodarilo sa otvoriť súbor `%s'!\n"
@@ -1929,111 +2005,6 @@ msgstr ""
 msgid "write content of file to the memory"
 msgstr ""
 
-#: src/detect.c:58
-#, c-format
-msgid "Cannot open %s\n"
-msgstr "Nepodarilo sa otvoriť %s\n"
-
-#: src/detect.c:205
-#, c-format
-msgid "IR length: %d\n"
-msgstr "Dĺžka IR: %d\n"
-
-#: src/detect.c:221
-#, c-format
-msgid "Unable to detect JTAG chain length\n"
-msgstr "Nepodarilo sa zdetekovať dĺžku JTAG reťazca\n"
-
-#: src/detect.c:224
-#, c-format
-msgid "Chain length: %d\n"
-msgstr "Dĺžka reťazca: %d\n"
-
-#: src/detect.c:265
-#, fuzzy, c-format
-msgid "Device Id: %s (0x%016lX)\n"
-msgstr "Id zariadenia: %s\n"
-
-#: src/detect.c:293
-#, c-format
-msgid "  Unknown manufacturer!\n"
-msgstr "  Neznámy výrobca!\n"
-
-#: src/detect.c:299
-#, c-format
-msgid "  Manufacturer: %s\n"
-msgstr "  Výrobca:   %s\n"
-
-#: src/detect.c:301
-#, c-format
-msgid "Warning: Manufacturer too long\n"
-msgstr "Upozornenie: Výrobca je príliš dlhý\n"
-
-#: src/detect.c:317
-#, c-format
-msgid "  Unknown part!\n"
-msgstr "  Neznáma sú�iastka!\n"
-
-#: src/detect.c:323
-#, fuzzy, c-format
-msgid "  Part(%d):         %s\n"
-msgstr "  Sú�iastka: %s\n"
-
-#: src/detect.c:325
-#, c-format
-msgid "Warning: Part too long\n"
-msgstr "Upozornenie: Sú�iastka je príliš dlhá\n"
-
-#: src/detect.c:341
-#, c-format
-msgid "  Unknown stepping!\n"
-msgstr "  Neznámy stupeň!\n"
-
-#: src/detect.c:347
-#, c-format
-msgid "  Stepping:     %s\n"
-msgstr "  Stupeň:    %s\n"
-
-#: src/detect.c:349
-#, c-format
-msgid "Warning: Stepping too long\n"
-msgstr "Upozornenie: Stupeň je príliš dlhý\n"
-
-#: src/detect.c:379
-#, c-format
-msgid "Error: Unable to detect JTAG chain end!\n"
-msgstr "Chyba: Nepodarilo sa zdetekovať koniec JTAG reťazca!\n"
-
-#: src/discovery.c:100
-#, c-format
-msgid "Warning: TDO seems to be stuck at %d\n"
-msgstr ""
-
-#: src/discovery.c:125
-#, c-format
-msgid "Detecting IR length ... "
-msgstr "Detekujem dĺžku IR ... "
-
-#: src/discovery.c:131 src/discovery.c:163
-#, c-format
-msgid "%d\n"
-msgstr "%d\n"
-
-#: src/discovery.c:134
-#, c-format
-msgid "Error: Invalid IR length!\n"
-msgstr "Chyba: Neplatná dĺžka IR!\n"
-
-#: src/discovery.c:145
-#, c-format
-msgid "Error: Out of memory!\n"
-msgstr "Chyba: Nedostatok pamäte!\n"
-
-#: src/discovery.c:157
-#, c-format
-msgid "Detecting DR length for IR %s ... "
-msgstr "Detekujem dĺžku DR pre IR %s ... "
-
 #: src/flash/amd.c:276
 #, c-format
 msgid ""
@@ -2183,270 +2154,95 @@ msgstr "Štandardná množina príkazov AMD/Fujitsu"
 msgid "supported: AMD 29LV040B, 29C040B, 1x8 Bit"
 msgstr "podporované: AMD 29LV800B; 1x16 bitov"
 
-#: src/flash.c:89
+#: src/flash/detectflash.c:87
 #, c-format
-msgid "unknown flash - vendor id: %d (0x%04x)\n"
-msgstr "neznáma flash pamäť - id dodávateľa: %d (0x%04x)\n"
+msgid "Flash not found!\n"
+msgstr "Pamäť flash nebola nájdená!\n"
 
-#: src/flash.c:93
+#: src/flash/detectflash.c:96
 #, c-format
-msgid "Flash not supported!\n"
-msgstr "Nepodporovaná flash pamäť!\n"
+msgid "Query identification string:\n"
+msgstr "Identifika�ný reťazec:\n"
 
-#: src/flash.c:104 src/flash.c:256 src/flash.c:368
-#, c-format
-msgid "no flash driver found\n"
-msgstr "ovláda� pre flash pamäť nebol nájdený\n"
+#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
+msgid "null"
+msgstr "ni�"
 
-#: src/flash.c:115
-#, c-format
-msgid "Invalid sync sequence!\n"
-msgstr "Neplatná synchroniza�ná sekvencia!\n"
+#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
+msgid "Intel/Sharp Extended Command Set"
+msgstr "Rozšírená sada príkazov Intel/Sharp"
 
-#: src/flash.c:133
-#, c-format
-msgid "block %d unlocked\n"
-msgstr "blok %d odomknutý\n"
+#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
+#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
+msgid "Intel Standard Command Set"
+msgstr "Štandardná sada príkazov Intel"
 
-#: src/flash.c:134 src/flash.c:290
-#, c-format
-msgid "erasing block %d: %d\n"
-msgstr "vymazávam blok %d: %d\n"
+#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
+msgid "AMD/Fujitsu Extended Command Set"
+msgstr "Rozšírená sada príkazov AMD/Fujitsu"
 
-#: src/flash.c:138 src/flash.c:275
-#, c-format
-msgid "program:\n"
-msgstr "programovanie:\n"
+#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
+msgid "Mitsubishi Standard Command Set"
+msgstr "Štandardná sada príkazov Mitsubishi"
 
-#: src/flash.c:146 src/flash.c:186
-#, c-format
-msgid "Error: premature end of file\n"
-msgstr "Chyba: neo�akávaný koniec súboru\n"
+#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
+msgid "Mitsubishi Extended Command Set"
+msgstr "Rozšírená sada príkazov Mitsubishi"
 
-#: src/flash.c:149 src/flash.c:189
-#, c-format
-msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
-msgstr "záznam: za�iatok = 0x%08X, dĺžka = 0x%08X, kontrolná suma = 0x%08X\n"
+#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
+msgid "Page Write Command Set"
+msgstr "Sada príkazov Page Write"
 
-#: src/flash.c:153 src/flash.c:193
-#, c-format
-msgid "Error: Invalid record length!\n"
-msgstr "Chyba: Neplatná dĺžka záznamu!\n"
+#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
+#: src/flash/detectflash.c:198
+msgid "unknown!!!"
+msgstr "neznáma!!!"
 
-#: src/flash.c:160 src/flash.c:200 src/readmem.c:105 src/writemem.c:87
+#: src/flash/detectflash.c:127
 #, c-format
-msgid "addr: 0x%08X"
-msgstr "adresa: 0x%08X"
+msgid ""
+"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
+msgstr ""
+"\tID kód sady príkazov a riadiaceho rozhrania primárneho algoritmu: 0x%04X (%"
+"s)\n"
 
-#: src/flash.c:165 src/flash.c:309
+#: src/flash/detectflash.c:157
 #, c-format
 msgid ""
-"\n"
-"flash error\n"
+"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
+"s)\n"
 msgstr ""
-"\n"
-"chyba flash\n"
+"\tID kód sady príkazov a riadiaceho rozhrania alternatívneho algoritmu: 0x%"
+"04X (%s)\n"
 
-#: src/flash.c:177 src/flash.c:320
+#: src/flash/detectflash.c:160
 #, c-format
-msgid "verify:\n"
-msgstr "kontrola:\n"
+msgid "Query system interface information:\n"
+msgstr "Informácie systémového rozhrania:\n"
 
-#: src/flash.c:206
+#: src/flash/detectflash.c:161
 #, c-format
-msgid ""
-"\n"
-"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
+msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
 msgstr ""
-"\n"
-"chyba pri kontrole: 0x%08X vs. 0x%08X na adrese %08X\n"
+"\tVcc minimálne napäte zdroja logiky pre zápis/vymazávanie alebo zápis: %d "
+"mV\n"
 
-#: src/flash.c:215 src/flash.c:354 src/readmem.c:113 src/writemem.c:122
+#: src/flash/detectflash.c:162
 #, c-format
-msgid ""
-"\n"
-"Done.\n"
+msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
 msgstr ""
-"\n"
-"Hotovo.\n"
+"\tVcc maximálne napätie zdroja logiky pre zápis/vymazávanie alebo zápis: %d "
+"mV\n"
 
-#: src/flash.c:269
+#: src/flash/detectflash.c:163
 #, c-format
-msgid "Out of memory!\n"
-msgstr "Nedostatok pamäte!\n"
+msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
+msgstr ""
+"\tVpp [programovanie] minimálne napátie zdroja pre zápis/vymazanie: %d mV\n"
 
-#: src/flash.c:289
+#: src/flash/detectflash.c:164
 #, c-format
-msgid ""
-"\n"
-"block %d unlocked\n"
-msgstr ""
-"\n"
-"blok %d odomknutý\n"
-
-#: src/flash.c:297 src/flash.c:344
-#, fuzzy, c-format
-msgid "addr: 0x%08X\r"
-msgstr "adresa: 0x%08X"
-
-#: src/flash.c:332
-#, c-format
-msgid "Error during file read.\n"
-msgstr "Chyba pri �ítaní zo súboru.\n"
-
-#: src/flash.c:349
-#, fuzzy, c-format
-msgid ""
-"\n"
-"verify error:\n"
-"read: 0x%08X\n"
-"expected: 0x%08X\n"
-msgstr ""
-"\n"
-"chyba pri kontrole:\n"
-"na�ítané: 0x%08X\n"
-"o�akávané: 0x%08X\n"
-
-#: src/flash.c:373
-#, c-format
-msgid ""
-"\n"
-"Erasing %d Flash block%s from address 0x%x\n"
-msgstr ""
-
-#: src/flash.c:378
-#, c-format
-msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
-msgstr ""
-
-#: src/flash.c:381
-#, c-format
-msgid "Erasing ... "
-msgstr ""
-
-#: src/flash.c:386
-#, c-format
-msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
-msgstr ""
-
-#: src/flash.c:388
-#, c-format
-msgid "Ok.\r%78s\r"
-msgstr ""
-
-#: src/flash.c:391
-#, c-format
-msgid "ERROR.\n"
-msgstr ""
-
-#: src/flash.c:397
-#, c-format
-msgid ""
-"\n"
-"Erasing Completed.\n"
-msgstr ""
-
-#: src/flash.c:399
-#, c-format
-msgid ""
-"\n"
-"Erasing Failed.\n"
-msgstr ""
-
-#: src/flash/detectflash.c:56 src/readmem.c:55 src/writemem.c:49
-#, c-format
-msgid "Error: Missing bus driver!\n"
-msgstr "Chyba: Chýba ovláda� zbernice!\n"
-
-#: src/flash/detectflash.c:87
-#, c-format
-msgid "Flash not found!\n"
-msgstr "Pamäť flash nebola nájdená!\n"
-
-#: src/flash/detectflash.c:96
-#, c-format
-msgid "Query identification string:\n"
-msgstr "Identifika�ný reťazec:\n"
-
-#: src/flash/detectflash.c:100 src/flash/detectflash.c:130
-msgid "null"
-msgstr "ni�"
-
-#: src/flash/detectflash.c:103 src/flash/detectflash.c:133
-msgid "Intel/Sharp Extended Command Set"
-msgstr "Rozšírená sada príkazov Intel/Sharp"
-
-#: src/flash/detectflash.c:109 src/flash/detectflash.c:139
-#: src/flash/intel.c:348 src/flash/intel.c:360 src/flash/intel.c:372
-msgid "Intel Standard Command Set"
-msgstr "Štandardná sada príkazov Intel"
-
-#: src/flash/detectflash.c:112 src/flash/detectflash.c:142
-msgid "AMD/Fujitsu Extended Command Set"
-msgstr "Rozšírená sada príkazov AMD/Fujitsu"
-
-#: src/flash/detectflash.c:115 src/flash/detectflash.c:145
-msgid "Mitsubishi Standard Command Set"
-msgstr "Štandardná sada príkazov Mitsubishi"
-
-#: src/flash/detectflash.c:118 src/flash/detectflash.c:148
-msgid "Mitsubishi Extended Command Set"
-msgstr "Rozšírená sada príkazov Mitsubishi"
-
-#: src/flash/detectflash.c:121 src/flash/detectflash.c:151
-msgid "Page Write Command Set"
-msgstr "Sada príkazov Page Write"
-
-#: src/flash/detectflash.c:124 src/flash/detectflash.c:154
-#: src/flash/detectflash.c:198
-msgid "unknown!!!"
-msgstr "neznáma!!!"
-
-#: src/flash/detectflash.c:127
-#, c-format
-msgid ""
-"\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"
-msgstr ""
-"\tID kód sady príkazov a riadiaceho rozhrania primárneho algoritmu: 0x%04X (%"
-"s)\n"
-
-#: src/flash/detectflash.c:157
-#, c-format
-msgid ""
-"\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%"
-"s)\n"
-msgstr ""
-"\tID kód sady príkazov a riadiaceho rozhrania alternatívneho algoritmu: 0x%"
-"04X (%s)\n"
-
-#: src/flash/detectflash.c:160
-#, c-format
-msgid "Query system interface information:\n"
-msgstr "Informácie systémového rozhrania:\n"
-
-#: src/flash/detectflash.c:161
-#, c-format
-msgid "\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"
-msgstr ""
-"\tVcc minimálne napäte zdroja logiky pre zápis/vymazávanie alebo zápis: %d "
-"mV\n"
-
-#: src/flash/detectflash.c:162
-#, c-format
-msgid "\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"
-msgstr ""
-"\tVcc maximálne napätie zdroja logiky pre zápis/vymazávanie alebo zápis: %d "
-"mV\n"
-
-#: src/flash/detectflash.c:163
-#, c-format
-msgid "\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"
-msgstr ""
-"\tVpp [programovanie] minimálne napátie zdroja pre zápis/vymazanie: %d mV\n"
-
-#: src/flash/detectflash.c:164
-#, c-format
-msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
+msgid "\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"
 msgstr ""
 "\tVpp [programovanie] maximálne napätie zdroja pre zápis/programovanie: %d "
 "mV\n"
@@ -2825,6 +2621,162 @@ msgstr ""
 msgid "\t\tBank%d: %d sectors\n"
 msgstr ""
 
+#: src/flash/flash.c:89
+#, c-format
+msgid "unknown flash - vendor id: %d (0x%04x)\n"
+msgstr "neznáma flash pamäť - id dodávateľa: %d (0x%04x)\n"
+
+#: src/flash/flash.c:93
+#, c-format
+msgid "Flash not supported!\n"
+msgstr "Nepodporovaná flash pamäť!\n"
+
+#: src/flash/flash.c:104 src/flash/flash.c:256 src/flash/flash.c:368
+#, c-format
+msgid "no flash driver found\n"
+msgstr "ovláda� pre flash pamäť nebol nájdený\n"
+
+#: src/flash/flash.c:115
+#, c-format
+msgid "Invalid sync sequence!\n"
+msgstr "Neplatná synchroniza�ná sekvencia!\n"
+
+#: src/flash/flash.c:133
+#, c-format
+msgid "block %d unlocked\n"
+msgstr "blok %d odomknutý\n"
+
+#: src/flash/flash.c:134 src/flash/flash.c:290
+#, c-format
+msgid "erasing block %d: %d\n"
+msgstr "vymazávam blok %d: %d\n"
+
+#: src/flash/flash.c:138 src/flash/flash.c:275
+#, c-format
+msgid "program:\n"
+msgstr "programovanie:\n"
+
+#: src/flash/flash.c:146 src/flash/flash.c:186
+#, c-format
+msgid "Error: premature end of file\n"
+msgstr "Chyba: neo�akávaný koniec súboru\n"
+
+#: src/flash/flash.c:149 src/flash/flash.c:189
+#, c-format
+msgid "record: start = 0x%08X, len = 0x%08X, checksum = 0x%08X\n"
+msgstr "záznam: za�iatok = 0x%08X, dĺžka = 0x%08X, kontrolná suma = 0x%08X\n"
+
+#: src/flash/flash.c:153 src/flash/flash.c:193
+#, c-format
+msgid "Error: Invalid record length!\n"
+msgstr "Chyba: Neplatná dĺžka záznamu!\n"
+
+#: src/flash/flash.c:165 src/flash/flash.c:309
+#, c-format
+msgid ""
+"\n"
+"flash error\n"
+msgstr ""
+"\n"
+"chyba flash\n"
+
+#: src/flash/flash.c:177 src/flash/flash.c:320
+#, c-format
+msgid "verify:\n"
+msgstr "kontrola:\n"
+
+#: src/flash/flash.c:206
+#, c-format
+msgid ""
+"\n"
+"verify error: 0x%08X vs. 0x%08X at addr %08X\n"
+msgstr ""
+"\n"
+"chyba pri kontrole: 0x%08X vs. 0x%08X na adrese %08X\n"
+
+#: src/flash/flash.c:269
+#, c-format
+msgid "Out of memory!\n"
+msgstr "Nedostatok pamäte!\n"
+
+#: src/flash/flash.c:289
+#, c-format
+msgid ""
+"\n"
+"block %d unlocked\n"
+msgstr ""
+"\n"
+"blok %d odomknutý\n"
+
+#: src/flash/flash.c:297 src/flash/flash.c:344
+#, fuzzy, c-format
+msgid "addr: 0x%08X\r"
+msgstr "adresa: 0x%08X"
+
+#: src/flash/flash.c:332
+#, c-format
+msgid "Error during file read.\n"
+msgstr "Chyba pri �ítaní zo súboru.\n"
+
+#: src/flash/flash.c:349
+#, fuzzy, c-format
+msgid ""
+"\n"
+"verify error:\n"
+"read: 0x%08X\n"
+"expected: 0x%08X\n"
+msgstr ""
+"\n"
+"chyba pri kontrole:\n"
+"na�ítané: 0x%08X\n"
+"o�akávané: 0x%08X\n"
+
+#: src/flash/flash.c:373
+#, c-format
+msgid ""
+"\n"
+"Erasing %d Flash block%s from address 0x%x\n"
+msgstr ""
+
+#: src/flash/flash.c:378
+#, c-format
+msgid "(%d%% Completed) FLASH Block %d : Unlocking ... "
+msgstr ""
+
+#: src/flash/flash.c:381
+#, c-format
+msgid "Erasing ... "
+msgstr ""
+
+#: src/flash/flash.c:386
+#, c-format
+msgid "\r(100%% Completed) FLASH Block %d : Unlocking ... Erasing ... Ok.\n"
+msgstr ""
+
+#: src/flash/flash.c:388
+#, c-format
+msgid "Ok.\r%78s\r"
+msgstr ""
+
+#: src/flash/flash.c:391
+#, c-format
+msgid "ERROR.\n"
+msgstr ""
+
+#: src/flash/flash.c:397
+#, c-format
+msgid ""
+"\n"
+"Erasing Completed.\n"
+msgstr ""
+
+#: src/flash/flash.c:399
+#, c-format
+msgid ""
+"\n"
+"Erasing Failed.\n"
+msgstr ""
+
 #: src/flash/intel.c:104
 #, c-format
 msgid "Manufacturer: %s\n"
@@ -2882,57 +2834,57 @@ msgstr "podporované: 28Fxxxx, 1 x 16 bitov"
 msgid "supported: 28Fxxxx, 1 x 8 bit"
 msgstr "podporované: 28Fxxxx, 1 x 8 bitov"
 
-#: src/jtag.c:356
+#: src/jtag.c:270
 #, c-format
 msgid "'%s' must not be run suid root!\n"
 msgstr ""
 
-#: src/jtag.c:417
+#: src/jtag.c:331
 #, fuzzy, c-format
 msgid "%s #%s\n"
 msgstr "%-13s %s\n"
 
-#: src/jtag.c:420
+#: src/jtag.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]\n"
 msgstr ""
 
-#: src/jtag.c:423
+#: src/jtag.c:337
 #, c-format
 msgid "  -h, --help          display this help and exit\n"
 msgstr ""
 
-#: src/jtag.c:424
+#: src/jtag.c:338
 #, c-format
 msgid "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#: src/jtag.c:426
+#: src/jtag.c:340
 #, c-format
 msgid "  -n, --norc          disable reading ~/.jtag/rc on startup\n"
 msgstr ""
 
-#: src/jtag.c:427
+#: src/jtag.c:341
 #, c-format
 msgid "  -i, --interactive   enter interactive mode after reading files\n"
 msgstr ""
 
-#: src/jtag.c:428
+#: src/jtag.c:342
 #, c-format
 msgid "  -q, --quiet         Do not print help on startup\n"
 msgstr ""
 
-#: src/jtag.c:430
+#: src/jtag.c:344
 #, c-format
 msgid "  [FILE]              file containing commands to execute\n"
 msgstr ""
 
-#: src/jtag.c:433
+#: src/jtag.c:347
 #, c-format
 msgid "  Please report bugs at http://www.urjtag.org\n"
 msgstr ""
 
-#: src/jtag.c:440
+#: src/jtag.c:354
 #, c-format
 msgid ""
 "\n"
@@ -2942,7 +2894,7 @@ msgid ""
 "Copyright (C) 2007, 2008 Kolja Waschk and the respective authors\n"
 msgstr ""
 
-#: src/jtag.c:445
+#: src/jtag.c:359
 #, c-format
 msgid ""
 "\n"
@@ -2961,7 +2913,7 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/jtag.c:502
+#: src/jtag.c:416
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2982,14 +2934,14 @@ msgstr ""
 "Neposkytuje sa žiadna záruka pre %s.\n"
 "\n"
 
-#: src/jtag.c:518
+#: src/jtag.c:432
 #, fuzzy, c-format
 msgid "WARNING: %s may damage your hardware!\n"
 msgstr ""
 "Upozornenie: %s môže poškodiť váš hardvér! Napíšte \"quit\" pre ukon�enie!\n"
 "\n"
 
-#: src/jtag.c:519
+#: src/jtag.c:433
 #, fuzzy, c-format
 msgid ""
 "Type \"quit\" to exit, \"help\" for help.\n"
@@ -3032,36 +2984,6 @@ msgstr "%%-%ds %%-%ds %%-%ds %%-%ds %%-%ds\n"
 msgid "(none)"
 msgstr "(ni�)"
 
-#: src/readmem.c:62 src/writemem.c:56
-#, c-format
-msgid "Error: Bus width detection failed\n"
-msgstr "Chyba: Detekcia šírky zbernice zlyhala\n"
-
-#: src/readmem.c:68 src/writemem.c:62
-#, c-format
-msgid "Unknown bus width!\n"
-msgstr "Neznáma šírka zbernice!\n"
-
-#: src/readmem.c:75 src/writemem.c:69
-#, c-format
-msgid "address: 0x%08X\n"
-msgstr "adresa: 0x%08X\n"
-
-#: src/readmem.c:76 src/writemem.c:70
-#, c-format
-msgid "length:  0x%08X\n"
-msgstr "dĺžka:  0x%08X\n"
-
-#: src/readmem.c:79 src/writemem.c:73
-#, c-format
-msgid "length is 0.\n"
-msgstr "dĺžka je 0.\n"
-
-#: src/readmem.c:85
-#, c-format
-msgid "reading:\n"
-msgstr "�ítam:\n"
-
 #: src/svf/svf.c:375 src/svf/svf.c:546 src/svf/svf.c:863 src/svf/svf.c:867
 #, fuzzy, c-format
 msgid "out of memory"
@@ -3459,6 +3381,111 @@ msgstr "%s(%d) Sú�iastka %d bez aktívnej inštrukcie\n"
 msgid "%s(%d) Part %d without data register\n"
 msgstr "%s(%d) Sú�iastka %d bez dátového registra\n"
 
+#: src/tap/detect.c:58
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "Nepodarilo sa otvoriť %s\n"
+
+#: src/tap/detect.c:205
+#, c-format
+msgid "IR length: %d\n"
+msgstr "Dĺžka IR: %d\n"
+
+#: src/tap/detect.c:221
+#, c-format
+msgid "Unable to detect JTAG chain length\n"
+msgstr "Nepodarilo sa zdetekovať dĺžku JTAG reťazca\n"
+
+#: src/tap/detect.c:224
+#, c-format
+msgid "Chain length: %d\n"
+msgstr "Dĺžka reťazca: %d\n"
+
+#: src/tap/detect.c:265
+#, fuzzy, c-format
+msgid "Device Id: %s (0x%016lX)\n"
+msgstr "Id zariadenia: %s\n"
+
+#: src/tap/detect.c:293
+#, c-format
+msgid "  Unknown manufacturer!\n"
+msgstr "  Neznámy výrobca!\n"
+
+#: src/tap/detect.c:299
+#, c-format
+msgid "  Manufacturer: %s\n"
+msgstr "  Výrobca:   %s\n"
+
+#: src/tap/detect.c:301
+#, c-format
+msgid "Warning: Manufacturer too long\n"
+msgstr "Upozornenie: Výrobca je príliš dlhý\n"
+
+#: src/tap/detect.c:317
+#, c-format
+msgid "  Unknown part!\n"
+msgstr "  Neznáma sú�iastka!\n"
+
+#: src/tap/detect.c:323
+#, fuzzy, c-format
+msgid "  Part(%d):         %s\n"
+msgstr "  Sú�iastka: %s\n"
+
+#: src/tap/detect.c:325
+#, c-format
+msgid "Warning: Part too long\n"
+msgstr "Upozornenie: Sú�iastka je príliš dlhá\n"
+
+#: src/tap/detect.c:341
+#, c-format
+msgid "  Unknown stepping!\n"
+msgstr "  Neznámy stupeň!\n"
+
+#: src/tap/detect.c:347
+#, c-format
+msgid "  Stepping:     %s\n"
+msgstr "  Stupeň:    %s\n"
+
+#: src/tap/detect.c:349
+#, c-format
+msgid "Warning: Stepping too long\n"
+msgstr "Upozornenie: Stupeň je príliš dlhý\n"
+
+#: src/tap/detect.c:379
+#, c-format
+msgid "Error: Unable to detect JTAG chain end!\n"
+msgstr "Chyba: Nepodarilo sa zdetekovať koniec JTAG reťazca!\n"
+
+#: src/tap/discovery.c:100
+#, c-format
+msgid "Warning: TDO seems to be stuck at %d\n"
+msgstr ""
+
+#: src/tap/discovery.c:125
+#, c-format
+msgid "Detecting IR length ... "
+msgstr "Detekujem dĺžku IR ... "
+
+#: src/tap/discovery.c:131 src/tap/discovery.c:163
+#, c-format
+msgid "%d\n"
+msgstr "%d\n"
+
+#: src/tap/discovery.c:134
+#, c-format
+msgid "Error: Invalid IR length!\n"
+msgstr "Chyba: Neplatná dĺžka IR!\n"
+
+#: src/tap/discovery.c:145
+#, c-format
+msgid "Error: Out of memory!\n"
+msgstr "Chyba: Nedostatok pamäte!\n"
+
+#: src/tap/discovery.c:157
+#, c-format
+msgid "Detecting DR length for IR %s ... "
+msgstr "Detekujem dĺžku DR pre IR %s ... "
+
 #: src/tap/parport/direct.c:167 src/tap/parport/ftd2xx.c:155
 #: src/tap/parport/ftdi.c:155 src/tap/parport/ppdev.c:119
 #: src/tap/parport/ppi.c:115
@@ -3544,31 +3571,6 @@ msgstr "Inicializujem %s na ppdev porte %s\n"
 msgid "%s: Invalid state: %2X\n"
 msgstr "%s: Neplatný stav: %2X\n"
 
-#: src/writemem.c:79
-#, fuzzy, c-format
-msgid "writing:\n"
-msgstr "�ítam:\n"
-
-#: src/writemem.c:91
-#, c-format
-msgid "Data not on word boundary, NOT SUPPORTED!"
-msgstr ""
-
-#: src/writemem.c:93
-#, fuzzy, c-format
-msgid "Unexpected end of file!\n"
-msgstr "Chyba: neo�akávaný koniec súboru\n"
-
-#: src/writemem.c:94
-#, fuzzy, c-format
-msgid "Addr: 0x%08X\n"
-msgstr "adresa: 0x%08X\n"
-
-#: src/writemem.c:99
-#, c-format
-msgid "Short read: bc=0x%X\n"
-msgstr ""
-
 #, fuzzy
 #~ msgid "Disconnecting %s, device %s\n"
 #~ msgstr "Odpájam %s z ppdev portu %s\n"