diff --git a/gtk/main.c b/gtk/main.c
index f3fdf45d5..de78e2ee6 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -561,7 +561,7 @@ gotdrag(GtkWidget *widget SHUTUP, GdkDragContext *dc, gint x SHUTUP,
   GList *errs;
   struct stat sb;
   int prelen = strlen(prefix);
-  GList *paths;
+  GList *paths, *freeables;
 
 #ifdef DND_DEBUG
   char *sele = gdk_atom_name(sel->selection);
@@ -582,6 +582,7 @@ gotdrag(GtkWidget *widget SHUTUP, GdkDragContext *dc, gint x SHUTUP,
 
   errs = NULL;
   paths = NULL;
+  freeables = NULL;
   if(gdk_atom_intern("XdndSelection", FALSE) == sel->selection &&
      8 == sel->format) {
     /* split file list on carriage returns and linefeeds */
@@ -600,6 +601,7 @@ gotdrag(GtkWidget *widget SHUTUP, GdkDragContext *dc, gint x SHUTUP,
         len = strlen(files + ii);
         /* de-urlencode the URI */
         decoded = urldecode(files + ii, len);
+        freeables = g_list_append(freeables, decoded);
         if(g_utf8_validate(decoded, -1, NULL)) {
           /* remove the file: prefix */
           if(prelen < len && 0 == strncmp(prefix, decoded, prelen)) {
@@ -616,16 +618,14 @@ gotdrag(GtkWidget *widget SHUTUP, GdkDragContext *dc, gint x SHUTUP,
             paths = g_list_append(paths, deslashed);
           }
         }
-        g_free(decoded);
       }
     }
 
     /* try to add any torrents we found */
-    if(NULL != paths) {
+    if(NULL != paths)
       addtorrents(data, NULL, paths, NULL,
                   addactionflag(cf_getpref(PREF_ADDSTD)));
-      freestrlist(paths);
-    }
+    freestrlist(freeables);
     g_free(files);
   }
 
diff --git a/gtk/po/fr.po b/gtk/po/fr.po
new file mode 100644
index 000000000..69761e5a9
--- /dev/null
+++ b/gtk/po/fr.po
@@ -0,0 +1,423 @@
+# $Id: transmission-gtk.pot 426 2006-06-22 02:11:45Z joshe $
+# French translation of PACKAGE.
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Pierre-Henri Quelen <pierrehenri.quelen@gmail.com>, 2006.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-18 00:33-0700\n"
+"PO-Revision-Date: 2006-06-24 04:09+0200\n"
+"Last-Translator: Pierre-Henri Quelen <pierrehenri.quelen@gmail.com>\n"
+"Language-Team: French <pierrehenri.quelen@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
+
+#: conf.c:95 conf.c:374
+#, c-format
+msgid ""
+"Failed to open the file %s for writing:\n"
+"%s"
+msgstr "Échec d'ouverture du fichier %s en écriture :"
+"%s"
+
+#: conf.c:110
+#, c-format
+msgid "Another copy of %s is already running."
+msgstr "Une autre instance de %s est déjà en cours d'exécution."
+
+#: conf.c:113
+#, c-format
+msgid ""
+"Failed to lock the file %s:\n"
+"%s"
+msgstr "Échec au verrouillage du fichier %s :\n"
+"%s"
+
+#: conf.c:136 dialogs.c:137
+#, c-format
+msgid ""
+"Failed to create the directory %s:\n"
+"%s"
+msgstr "Échec à la création du dossier %s :\n"
+"%s"
+
+#: conf.c:209
+#, c-format
+msgid ""
+"Failed to open the file %s for reading:\n"
+"%s"
+msgstr "Échec à l'ouverture du fichier %s en lecture :\n"
+"%s"
+
+#: conf.c:216
+#, c-format
+msgid ""
+"Error while reading from the file %s:\n"
+"%s"
+msgstr "Erreur lors de la lecture du fichier %s :\n"
+"%s"
+
+#: conf.c:388
+#, c-format
+msgid ""
+"Error while writing to the file %s:\n"
+"%s"
+msgstr "Erreur lors de l'écriture du fichier %s :\n"
+"%s"
+
+#: conf.c:394
+#, c-format
+msgid ""
+"Failed to rename the file %s to %s:\n"
+"%s"
+msgstr "Échec au renommage du fichier %s en %s :\n"
+"%s"
+
+#: dialogs.c:174
+#, c-format
+msgid "%s Preferences"
+msgstr "%s Préférences"
+
+#: dialogs.c:183 dialogs.c:407
+msgid "Choose a download directory"
+msgstr "Choisissez un dossier cible"
+
+#: dialogs.c:192
+msgid "_Limit download speed"
+msgstr "_Limiter le taux de réception"
+
+#: dialogs.c:194
+msgid "Maximum _download speed:"
+msgstr "Taux maximum de _réception :"
+
+#: dialogs.c:196
+msgid "Li_mit upload speed"
+msgstr "Li_miter le taux d'émission"
+
+#: dialogs.c:198
+msgid "Maximum _upload speed:"
+msgstr "Taux maximum d'_émission :"
+
+#. directory label and chooser
+#: dialogs.c:246
+msgid "Download di_rectory:"
+msgstr "Dossier _cible :"
+
+#. port label and entry
+#: dialogs.c:255
+msgid "Listening _port:"
+msgstr "P_ort d'écoute :"
+
+#: dialogs.c:268
+msgid "Use the torrent file where it is"
+msgstr "Utiliser le fichier .torrent original"
+
+#: dialogs.c:271
+msgid "Keep a copy of the torrent file"
+msgstr "Garder une copie du fichier .torrent"
+
+#: dialogs.c:274
+msgid "Keep a copy and remove the original"
+msgstr "Garder une copie et supprimer l'original"
+
+#. std
+#: dialogs.c:277
+msgid "For torrents added _normally:"
+msgstr "Pour les torrents _ajoutés normalement :"
+
+#: dialogs.c:291
+msgid ""
+"For torrents added e_xternally\n"
+"(via the command-line):"
+msgstr "Pour les torrents ajoutés a_utrement\n"
+"(via la ligne de commande):"
+
+#: dialogs.c:394
+msgid "Add a Torrent"
+msgstr "Ajouter un torrent"
+
+#: dialogs.c:401
+msgid "Automatically _start torrent"
+msgstr "_Démarrer le torrent automatiquement"
+
+#: dialogs.c:403
+msgid "Use alternate _download directory"
+msgstr "Utilisez un _dossier cible différent"
+
+#: dialogs.c:432
+msgid "Torrent files"
+msgstr "Fichiers .torrent"
+
+#: dialogs.c:434
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: dialogs.c:542
+#, c-format
+msgid "%s Properties"
+msgstr "%s Propriétés"
+
+#: dialogs.c:567 dialogs.c:570
+msgid "Tracker:"
+msgstr "Tracker :"
+
+#: dialogs.c:572
+msgid "Announce:"
+msgstr "Annonce :"
+
+#: dialogs.c:573
+msgid "Piece Size:"
+msgstr "Taille des pièces :"
+
+#: dialogs.c:574
+msgid "Pieces:"
+msgstr "Nombre de pièce :"
+
+#: dialogs.c:575
+msgid "Total Size:"
+msgstr "Taille totale :"
+
+#: dialogs.c:577 dialogs.c:579
+msgid "Seeders:"
+msgstr "Seeders :"
+
+#: dialogs.c:577 dialogs.c:581
+msgid "?"
+msgstr "?"
+
+#: dialogs.c:581 dialogs.c:583
+msgid "Leechers:"
+msgstr "Leechers :"
+
+#: dialogs.c:587
+msgid "Directory:"
+msgstr "Dossier :"
+
+#: dialogs.c:588
+msgid "Downloaded:"
+msgstr "Reçu :"
+
+#: dialogs.c:589
+msgid "Uploaded:"
+msgstr "Émis :"
+
+#: ipc.c:208
+#, c-format
+msgid ""
+"Failed to set up socket:\n"
+"%s"
+msgstr "Échec à la configuration du socket :\n"
+"%s"
+
+#: ipc.c:229
+#, c-format
+msgid "failed to create socket: %s\n"
+msgstr "Échec à la création du socket : %s\n"
+
+#: ipc.c:238
+#, c-format
+msgid "failed to connect to %s: %s\n"
+msgstr "Échec à la connexion à %s : %s\n"
+
+#: ipc.c:403
+#, c-format
+msgid "bad IPC protocol version\n"
+msgstr "Mauvaise version de protocole IPC\n"
+
+#: main.c:150
+msgid "Add"
+msgstr "Ajouter"
+
+#: main.c:151
+msgid "Add a new torrent"
+msgstr "Ajouter un nouveau torrent"
+
+#: main.c:152
+msgid "Start"
+msgstr "Démarrer"
+
+#: main.c:154
+msgid "Start a torrent that is not running"
+msgstr "Démarrer un torrent inactif"
+
+#: main.c:155
+msgid "Stop"
+msgstr "Arrêter"
+
+#: main.c:157
+msgid "Stop a torrent that is running"
+msgstr "Arrêter un torrent actif"
+
+#: main.c:158
+msgid "Remove"
+msgstr "Supprimer"
+
+#: main.c:159
+msgid "Remove a torrent"
+msgstr "Supprimer un torrent"
+
+#: main.c:160
+msgid "Properties"
+msgstr "Propriétés"
+
+#: main.c:161
+msgid "Show additional information about a torrent"
+msgstr "Afficher des informations supplémentaires concernant un torrent"
+
+#: main.c:162
+msgid "Preferences"
+msgstr "Préférences"
+
+#: main.c:163
+msgid "Customize application behavior"
+msgstr "Personnaliser le comportement de l'application"
+
+#: main.c:200
+msgid "Transmission"
+msgstr "Transmission"
+
+#: main.c:453
+msgid "Name"
+msgstr "Nom"
+
+#. this string is only used to determing the size of the progress bar
+#: main.c:461
+msgid "  fnord    fnord  "
+msgstr ""
+
+#: main.c:464
+msgid "Progress"
+msgstr "Progression"
+
+#: main.c:700
+#, c-format
+msgid "Checking existing files (%.1f%%)"
+msgstr "Vérification des fichiers existants (%.1f%%)"
+
+#: main.c:703
+#, c-format
+msgid "Finishing in --:--:-- (%.1f%%)"
+msgstr "Temps restant : --:--:--·(%.1f%%)"
+
+#: main.c:705
+#, c-format
+msgid "Finishing in %02i:%02i:%02i (%.1f%%)"
+msgstr "Temps restant : %02i:%02i:%02i (%.1f%%)"
+
+#: main.c:709
+#, c-format
+msgid "Seeding, uploading to %d of %d peer"
+msgid_plural "Seeding, uploading to %d of %d peers"
+msgstr[0] "Émission vers %d de %d pair"
+msgstr[1] "Émission vers %d de %d pairs"
+
+#: main.c:713
+msgid "Stopping..."
+msgstr "Arrêt..."
+
+#: main.c:715
+#, c-format
+msgid "Stopped (%.1f%%)"
+msgstr "Arrêté (%.1f%%)"
+
+#: main.c:723
+msgid "Error: "
+msgstr "Erreur : "
+
+#: main.c:727
+#, c-format
+msgid "Downloading from %i of %i peer"
+msgid_plural "Downloading from %i of %i peers"
+msgstr[0] "Réception depuis %i de %i pair"
+msgstr[1] "Réception depuis %i de %i pairs"
+
+#: main.c:761
+#, c-format
+msgid ""
+"Ratio: %s\n"
+"UL: %s/s"
+msgstr ""
+"Ratio : %s\n"
+"Émission : %s/s"
+
+#: main.c:764
+#, c-format
+msgid ""
+"DL: %s/s\n"
+"UL: %s/s"
+msgstr ""
+"Réception : %s/s\n"
+"Émission : %s/s"
+
+#: main.c:810
+#, c-format
+msgid "     Total DL: %s/s     Total UL: %s/s"
+msgstr "     Taux global de réception : %s/s     Taux global d'émission : %s/s"
+
+#: main.c:1081
+#, c-format
+msgid ""
+"Failed to load torrent file:\n"
+"%s"
+"Failed to load torrent files:\n"
+"%s"
+msgstr ""
+"Échec de chargement du ficher .torrent :\n"
+"%s"
+"Échec du chargement des fichiers .torrent :\n"
+"%s"
+
+#: tr_torrent.c:290
+#, c-format
+msgid "%s: not a valid torrent file"
+msgstr "%s n'est pas un fichier .torrent valide"
+
+#: tr_torrent.c:293
+#, c-format
+msgid "%s: torrent is already open"
+msgstr "%s : ce torrent est déjà ouvert"
+
+#: util.c:67
+msgid "B"
+msgstr "o"
+
+#: util.c:67
+msgid "KiB"
+msgstr "ko"
+
+#: util.c:67
+msgid "MiB"
+msgstr "Mo"
+
+#: util.c:67
+msgid "GiB"
+msgstr "Go"
+
+#: util.c:67
+msgid "TiB"
+msgstr "To"
+
+#: util.c:67
+msgid "PiB"
+msgstr "Po"
+
+#: util.c:67
+msgid "EiB"
+msgstr "Eo"
+
+#: util.c:92
+msgid "N/A"
+msgstr "N/A"
+
+#. this is a UTF-8 infinity symbol
+#: util.c:96
+msgid "∞"
+msgstr "∞"
+
diff --git a/gtk/po/it.po b/gtk/po/it.po
index 96d436343..f2e5a7790 100644
--- a/gtk/po/it.po
+++ b/gtk/po/it.po
@@ -1,25 +1,25 @@
 # $Id$
 #
-# translation of it.utf8.po to Italiano
+# translation of it.po to Italiano
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Calorì Alessandro <lex82@fastwebnet.it>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: it.utf8\n"
+"Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-25 00:28-0700\n"
-"PO-Revision-Date: 2006-04-14 18:02+0200\n"
+"POT-Creation-Date: 2006-06-18 00:33-0700\n"
+"PO-Revision-Date: 2006-06-22 12:04+0100\n"
 "Last-Translator: Calorì Alessandro <lex82@fastwebnet.it>\n"
 "Language-Team: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: conf.c:87
+#: conf.c:95 conf.c:374
 #, c-format
 msgid ""
 "Failed to open the file %s for writing:\n"
@@ -28,12 +28,12 @@ msgstr ""
 "Impossibile aprire il file %s in scrittura:\n"
 "%s"
 
-#: conf.c:102
+#: conf.c:110
 #, c-format
 msgid "Another copy of %s is already running."
 msgstr "Un'altra istanza di %s è in esecuzione."
 
-#: conf.c:105
+#: conf.c:113
 #, c-format
 msgid ""
 "Failed to lock the file %s:\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Impossibile bloccare il file %s:\n"
 "%s"
 
-#: conf.c:128 dialogs.c:213 main.c:1130
+#: conf.c:136 dialogs.c:137
 #, c-format
 msgid ""
 "Failed to create the directory %s:\n"
@@ -51,7 +51,7 @@ msgstr ""
 "Impossibile creare la cartella %s:\n"
 "%s"
 
-#: conf.c:197 conf.c:370
+#: conf.c:209
 #, c-format
 msgid ""
 "Failed to open the file %s for reading:\n"
@@ -60,7 +60,7 @@ msgstr ""
 "Impossibile aprire il file %s in lettura:\n"
 "%s"
 
-#: conf.c:216 conf.c:389
+#: conf.c:216
 #, c-format
 msgid ""
 "Error while reading from the file %s:\n"
@@ -69,16 +69,7 @@ msgstr ""
 "Si è verificato un errore durante la lettura del file %s:\n"
 "%s"
 
-#: conf.c:280 conf.c:491
-#, c-format
-msgid ""
-"Failed to open or lock the file %s:\n"
-"%s"
-msgstr ""
-"Impossibile aprire o bloccare il file %s:\n"
-"%s"
-
-#: conf.c:300 conf.c:533
+#: conf.c:388
 #, c-format
 msgid ""
 "Error while writing to the file %s:\n"
@@ -87,7 +78,7 @@ msgstr ""
 "Si è verificato un errore durante la scrittura del file %s:\n"
 "%s"
 
-#: conf.c:307 conf.c:540
+#: conf.c:394
 #, c-format
 msgid ""
 "Failed to rename the file %s to %s:\n"
@@ -96,112 +87,136 @@ msgstr ""
 "Impossibile rinominare il file %s in %s:\n"
 "%s"
 
-#: dialogs.c:77
+#: dialogs.c:174
 #, c-format
 msgid "%s Preferences"
 msgstr "%s Preferenze"
 
-#: dialogs.c:86 dialogs.c:301
-#, fuzzy
+#: dialogs.c:183 dialogs.c:407
 msgid "Choose a download directory"
 msgstr "Scegli una cartella di destinazione"
 
-#: dialogs.c:94
+#: dialogs.c:192
 msgid "_Limit download speed"
 msgstr "_Limita la velocità di ricezione"
 
-#: dialogs.c:96
+#: dialogs.c:194
 msgid "Maximum _download speed:"
 msgstr "Velocità di _ricezione massima:"
 
-#: dialogs.c:98
+#: dialogs.c:196
 msgid "Li_mit upload speed"
 msgstr "Li_mita la velocità di invio"
 
-#: dialogs.c:100
+#: dialogs.c:198
 msgid "Maximum _upload speed:"
 msgstr "Velocità massima di _invio:"
 
 #. directory label and chooser
-#: dialogs.c:152
+#: dialogs.c:246
 msgid "Download di_rectory:"
 msgstr "Ca_rtella di destinazione:"
 
 #. port label and entry
-#: dialogs.c:162
+#: dialogs.c:255
 msgid "Listening _port:"
 msgstr "_Porta d'ascolto:"
 
-#: dialogs.c:288
+#: dialogs.c:268
+msgid "Use the torrent file where it is"
+msgstr "Usa il torrent e lascialo dov'è"
+
+#: dialogs.c:271
+msgid "Keep a copy of the torrent file"
+msgstr "Crea una copia del file torrent"
+
+#: dialogs.c:274
+msgid "Keep a copy and remove the original"
+msgstr "Crea una copia e rimuovi l'originale"
+
+#. std
+#: dialogs.c:277
+msgid "For torrents added _normally:"
+msgstr "Per i torrent aggiunti _normalmente:"
+
+#: dialogs.c:291
+msgid ""
+"For torrents added e_xternally\n"
+"(via the command-line):"
+msgstr ""
+"Per i torrent aggiunti e_sternamente:\n"
+"(tramite la linea di comando):"
+
+#: dialogs.c:394
 msgid "Add a Torrent"
 msgstr "Aggiungi un nuovo torrent"
 
-#: dialogs.c:295
+#: dialogs.c:401
 msgid "Automatically _start torrent"
 msgstr "Avvia automaticamente que_sto torrent"
 
-#: dialogs.c:297
+#: dialogs.c:403
 msgid "Use alternate _download directory"
 msgstr "Usa una cartella di _destinazione diversa"
 
-#: dialogs.c:327
+#: dialogs.c:432
 msgid "Torrent files"
-msgstr "File Torrent"
+msgstr "File torrent"
 
-#: dialogs.c:329
+#: dialogs.c:434
 msgid "All files"
 msgstr "Tutti i file"
 
-#: dialogs.c:432
+#: dialogs.c:542
 #, c-format
 msgid "%s Properties"
 msgstr "%s Proprietà"
 
-#: dialogs.c:457 dialogs.c:460
+#: dialogs.c:567 dialogs.c:570
 msgid "Tracker:"
 msgstr "Tracker:"
 
-#: dialogs.c:462
+#: dialogs.c:572
 msgid "Announce:"
 msgstr "Annuncio:"
 
-#: dialogs.c:463
+#: dialogs.c:573
 msgid "Piece Size:"
 msgstr "Dim. pezzo:"
 
-#: dialogs.c:464
+#: dialogs.c:574
 msgid "Pieces:"
 msgstr "Pezzi:"
 
-#: dialogs.c:465
+#: dialogs.c:575
 msgid "Total Size:"
 msgstr "Dim. totale:"
 
-#: dialogs.c:467 dialogs.c:469
+#: dialogs.c:577 dialogs.c:579
 msgid "Seeders:"
 msgstr "Fonti complete:"
 
-#: dialogs.c:467 dialogs.c:471
+#: dialogs.c:577 dialogs.c:581
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: dialogs.c:471 dialogs.c:473
+#: dialogs.c:581 dialogs.c:583
 msgid "Leechers:"
 msgstr "Fonti parziali:"
 
-#: dialogs.c:477
+#: dialogs.c:587
 msgid "Directory:"
 msgstr "Cartella:"
 
-#: dialogs.c:478
+#: dialogs.c:588
 msgid "Downloaded:"
 msgstr "Dati scaricati:"
 
-#: dialogs.c:479
+#: dialogs.c:589
 msgid "Uploaded:"
 msgstr "Dati inviati:"
 
-#: ipc.c:209
+#: ipc.c:208
 #, c-format
 msgid ""
 "Failed to set up socket:\n"
@@ -210,143 +225,129 @@ msgstr ""
 "Impossibile creare il socket:\n"
 "%s"
 
-#: ipc.c:230
+#: ipc.c:229
 #, c-format
-#, fuzzy
 msgid "failed to create socket: %s\n"
-msgstr ""
+msgstr "impossibile creare il socket: %s\n"
 
-#: ipc.c:239
+#: ipc.c:238
 #, c-format
-#, fuzzy
 msgid "failed to connect to %s: %s\n"
-msgstr ""
+msgstr "impossibile connettersi a %s: %s\n"
 
-#: ipc.c:400 main.c:366 main.c:663 main.c:1142
-#, c-format
-msgid "Failed to load the torrent file %s"
-msgid_plural ""
-"Failed to load the torrent files:\n"
-"%s"
-msgstr[0] "Impossibile caricare il file torrent %s"
-msgstr[1] ""
-"Impossibile caricare i file torrent:\n"
-"%s"
-
-#: ipc.c:418
+#: ipc.c:403
 #, c-format
 msgid "bad IPC protocol version\n"
-msgstr ""
+msgstr "versione errata del protocollo IPC\n"
 
-#: main.c:168
+#: main.c:150
 msgid "Add"
 msgstr "Aggiungi"
 
-#: main.c:169
+#: main.c:151
 msgid "Add a new torrent"
 msgstr "Aggiungi un nuovo torrent"
 
-#: main.c:170
+#: main.c:152
 msgid "Start"
 msgstr "Avvia"
 
-#: main.c:172
+#: main.c:154
 msgid "Start a torrent that is not running"
 msgstr "Avvia un torrent che è stato interrotto"
 
-#: main.c:173
+#: main.c:155
 msgid "Stop"
 msgstr "Interrompi"
 
-#: main.c:175
+#: main.c:157
 msgid "Stop a torrent that is running"
 msgstr "Interrompe un torrent che è stato avviato"
 
-#: main.c:176
+#: main.c:158
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: main.c:177
+#: main.c:159
 msgid "Remove a torrent"
 msgstr "Rimuovi un torrent"
 
-#: main.c:178
+#: main.c:160
 msgid "Properties"
 msgstr "Proprietà"
 
-#: main.c:179
+#: main.c:161
 msgid "Show additional information about a torrent"
 msgstr "Mostra informazioni aggiuntive su un torrent"
 
-#: main.c:180
+#: main.c:162
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: main.c:181
+#: main.c:163
 msgid "Customize application behavior"
 msgstr "Personalizza il comportamento dell'applicazione"
 
-#: main.c:219
+#: main.c:200
 msgid "Transmission"
 msgstr "Transmission"
 
-#: main.c:459
+#: main.c:453
 msgid "Name"
 msgstr "Nome"
 
 #. this string is only used to determing the size of the progress bar
-#: main.c:466
+#: main.c:461
 msgid "  fnord    fnord  "
 msgstr "  fnord    fnord  "
 
-#: main.c:469
+#: main.c:464
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: main.c:740
+#: main.c:700
 #, c-format
 msgid "Checking existing files (%.1f%%)"
-msgstr "Controllo dei file esistenti (%.1f%%)"
+msgstr "Controllo i file esistenti (%.1f%%)"
 
-#: main.c:743
+#: main.c:703
 #, c-format
 msgid "Finishing in --:--:-- (%.1f%%)"
 msgstr "Completamento tra --:--:-- (%.1f%%)"
 
-#: main.c:745
+#: main.c:705
 #, c-format
 msgid "Finishing in %02i:%02i:%02i (%.1f%%)"
 msgstr "Completamento tra %02i:%02i:%02i (%.1f%%)"
 
-#: main.c:749
+#: main.c:709
 #, c-format
-#, fuzzy
 msgid "Seeding, uploading to %d of %d peer"
 msgid_plural "Seeding, uploading to %d of %d peers"
 msgstr[0] "Completato, invio a %d utente (%d disponibili)"
 msgstr[1] "Completato, invio a %d utenti (%d disponibili)"
 
-#: main.c:753
+#: main.c:713
 msgid "Stopping..."
 msgstr "Interruzione in corso..."
 
-#: main.c:755
+#: main.c:715
 #, c-format
 msgid "Stopped (%.1f%%)"
 msgstr "Interrotto (%.1f%%)"
 
-#: main.c:763
+#: main.c:723
 msgid "Error: "
 msgstr "Errore: "
 
-#: main.c:767
+#: main.c:727
 #, c-format
 msgid "Downloading from %i of %i peer"
 msgid_plural "Downloading from %i of %i peers"
 msgstr[0] "Ricezione da %i utente (%i disponibili)"
 msgstr[1] "Ricezione da %i utenti (%i disponibili)"
 
-#: main.c:800
+#: main.c:761
 #, c-format
 msgid ""
 "Ratio: %s\n"
@@ -355,7 +356,7 @@ msgstr ""
 "Rapporto: %s\n"
 "Dati inviati: %s/s"
 
-#: main.c:803
+#: main.c:764
 #, c-format
 msgid ""
 "DL: %s/s\n"
@@ -364,63 +365,68 @@ msgstr ""
 "Dati ricev.: %s/s\n"
 "Dati inviati: %s/s"
 
-#: main.c:849
+#: main.c:810
 #, c-format
 msgid "     Total DL: %s/s     Total UL: %s/s"
 msgstr "     Velocità di ricezione: %s/s     Velocità d'invio: %s/s"
 
-#: main.c:1118
-msgid "not a valid torrent file"
-msgstr "il file torrent non è valido"
-
-#: main.c:1119
-msgid "torrent is already open"
-msgstr "il file torrent è già aperto"
-
-#: main.c:1144
+#: main.c:1081
 #, c-format
-msgid "Failed to load the torrent file %s: %s"
-msgstr "Impossibile caricare il file torrent %s: %s"
+msgid ""
+"Failed to load torrent file:\n"
+"%s"
+msgid_plural ""
+"Failed to load torrent files:\n"
+"%s"
+msgstr[0] "Impossibile caricare il file torrent %s"
+msgstr[1] ""
+"Impossibile caricare i file torrent:\n"
+"%s"
 
-#: main.c:1150
+#: tr_torrent.c:290
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "%s: not a valid torrent file"
+msgstr "%s: il file torrent non è valido"
 
-#: util.c:64
+#: tr_torrent.c:293
+#, c-format
+msgid "%s: torrent is already open"
+msgstr "%s: il file torrent è già aperto"
+
+#: util.c:67
 msgid "B"
 msgstr "B"
 
-#: util.c:64
+#: util.c:67
 msgid "KiB"
 msgstr "KiB"
 
-#: util.c:64
+#: util.c:67
 msgid "MiB"
 msgstr "MiB"
 
-#: util.c:64
+#: util.c:67
 msgid "GiB"
 msgstr "GiB"
 
-#: util.c:64
+#: util.c:67
 msgid "TiB"
 msgstr "TiB"
 
-#: util.c:64
+#: util.c:67
 msgid "PiB"
 msgstr "PiB"
 
-#: util.c:64
+#: util.c:67
 msgid "EiB"
 msgstr "EiB"
 
-#: util.c:89
+#: util.c:92
 msgid "N/A"
 msgstr "N/D"
 
 #. this is a UTF-8 infinity symbol
-#: util.c:93
+#: util.c:96
 msgid "∞"
 msgstr "∞"