diff --git a/po/POTFILES.in b/po/POTFILES.in
index 95df80f91..41e8c396d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,9 @@
 glade/delugegtk.glade
 glade/dgtkpopups.glade
 glade/dgtkpref.glade
-src/dcommon.py
-src/deluge.py
-src/deluge_core.cpp
-src/delugegtk.py
-src/delugeplugins.py
-src/deluge_stats.py
-src/dgtk.py
-src/pref.py
+glade/preferences_dialog.glade
+glade/torrent_menu.glade
+src/common.py
+src/core.py
+src/interface.py
+src/dialogs.py
\ No newline at end of file
diff --git a/po/deluge.pot b/po/deluge.pot
index e36e9d8d9..8d5be2a48 100644
--- a/po/deluge.pot
+++ b/po/deluge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-06 16:19-0500\n"
+"POT-Creation-Date: 2007-05-17 20:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,177 +16,189 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: glade/delugegtk.glade:93
+#: glade/delugegtk.glade:87
+msgid "<b>Progress:</b>"
+msgstr ""
+
+#: glade/delugegtk.glade:101
+msgid "<b>Name:</b>"
+msgstr ""
+
+#: glade/delugegtk.glade:141
 msgid "<b>Estimated Time Remaining:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:131
+#: glade/delugegtk.glade:179
 msgid "<b>Peers:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:145
+#: glade/delugegtk.glade:193
 msgid "<b>Seeders:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:157
+#: glade/delugegtk.glade:205
 msgid "<b>Total Size:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:169
+#: glade/delugegtk.glade:217
 msgid "<b>Total Downloaded:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:181
+#: glade/delugegtk.glade:229
 msgid "<b>Downloaded this session:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:229
+#: glade/delugegtk.glade:277
 msgid "<b>Tracker:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:241
+#: glade/delugegtk.glade:289
 msgid "<b>Tracker Response:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:253
+#: glade/delugegtk.glade:301
 msgid "<b>Tracker Status:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:277
+#: glade/delugegtk.glade:325
 msgid "<b>Next Announce:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:303
+#: glade/delugegtk.glade:351
 msgid "<b>Pieces:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:317
+#: glade/delugegtk.glade:365
 msgid "<b>Total Uploaded:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:355
+#: glade/delugegtk.glade:403
 msgid "<b>Share Ratio:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:369
+#: glade/delugegtk.glade:417
 msgid "<b>Uploaded This Session:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:431
+#: glade/delugegtk.glade:479
 msgid "<b>Use compact storage allocation:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:455
+#: glade/delugegtk.glade:503
 msgid "<b>Download Rate:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:479
+#: glade/delugegtk.glade:527
 msgid "<b>Upload Rate:</b>"
 msgstr ""
 
-#: glade/delugegtk.glade:522 glade/delugegtk.glade:746
+#: glade/delugegtk.glade:561 glade/delugegtk.glade:824
 msgid "Details"
 msgstr ""
 
-#: glade/delugegtk.glade:549 glade/delugegtk.glade:790
-#: glade/dgtkpopups.glade:37 src/delugegtk.py:352
+#: glade/delugegtk.glade:588 glade/delugegtk.glade:868
+#: glade/dgtkpopups.glade:37 src/interface.py:310
 msgid "Peers"
 msgstr ""
 
-#: glade/delugegtk.glade:578
+#: glade/delugegtk.glade:617
 msgid "Files"
 msgstr ""
 
-#: glade/delugegtk.glade:613
-msgid "_File"
+#: glade/delugegtk.glade:652
+msgid "Log"
 msgstr ""
 
-#: glade/delugegtk.glade:620 glade/delugegtk.glade:901 src/delugegtk.py:174
+#: glade/delugegtk.glade:691
+msgid "_Torrent"
+msgstr ""
+
+#: glade/delugegtk.glade:698 glade/delugegtk.glade:979 src/interface.py:201
 msgid "Add Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:636
+#: glade/delugegtk.glade:714
 msgid "Add Torrent from URL"
 msgstr ""
 
-#: glade/delugegtk.glade:644 glade/delugegtk.glade:914
+#: glade/delugegtk.glade:722 glade/delugegtk.glade:992
 #: glade/dgtkpopups.glade:81
 msgid "Remove Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:658
+#: glade/delugegtk.glade:736
 msgid "Clear Completed"
 msgstr ""
 
-#: glade/delugegtk.glade:692
+#: glade/delugegtk.glade:770
 msgid "_Edit"
 msgstr ""
 
-#: glade/delugegtk.glade:709 glade/dgtkpopups.glade:221
-#: glade/dgtkpref.glade:697 src/delugegtk.py:177
+#: glade/delugegtk.glade:787 glade/dgtkpopups.glade:221
+#: glade/dgtkpref.glade:697 src/interface.py:204
 msgid "Plugins"
 msgstr ""
 
-#: glade/delugegtk.glade:729
+#: glade/delugegtk.glade:807
 msgid "_View"
 msgstr ""
 
-#: glade/delugegtk.glade:737
+#: glade/delugegtk.glade:815
 msgid "Toolbar"
 msgstr ""
 
-#: glade/delugegtk.glade:755
+#: glade/delugegtk.glade:833
 msgid "Columns"
 msgstr ""
 
-#: glade/delugegtk.glade:763 glade/dgtkpopups.glade:10 src/delugegtk.py:349
-#: src/delugegtk.py:479
+#: glade/delugegtk.glade:841 glade/dgtkpopups.glade:10 src/interface.py:307
+#: src/interface.py:444
 msgid "Size"
 msgstr ""
 
-#: glade/delugegtk.glade:772 glade/dgtkpopups.glade:19 src/delugegtk.py:350
+#: glade/delugegtk.glade:850 glade/dgtkpopups.glade:19 src/interface.py:308
 msgid "Status"
 msgstr ""
 
-#: glade/delugegtk.glade:781 glade/dgtkpopups.glade:28 src/delugegtk.py:351
+#: glade/delugegtk.glade:859 glade/dgtkpopups.glade:28 src/interface.py:309
 msgid "Seeders"
 msgstr ""
 
-#: glade/delugegtk.glade:799 src/delugegtk.py:353 src/delugegtk.py:477
-#: src/delugegtk.py:692 src/delugegtk.py:704
+#: glade/delugegtk.glade:877 glade/torrent_menu.glade:160 src/interface.py:311
+#: src/interface.py:442 src/interface.py:588 src/interface.py:600
 msgid "Download"
 msgstr ""
 
-#: glade/delugegtk.glade:808 src/delugegtk.py:354 src/delugegtk.py:693
-#: src/delugegtk.py:705
+#: glade/delugegtk.glade:886 glade/torrent_menu.glade:130 src/interface.py:312
+#: src/interface.py:589 src/interface.py:601
 msgid "Upload"
 msgstr ""
 
-#: glade/delugegtk.glade:817 glade/dgtkpopups.glade:64 src/delugegtk.py:355
+#: glade/delugegtk.glade:895 glade/dgtkpopups.glade:64 src/interface.py:313
 msgid "Time Remaining"
 msgstr ""
 
-#: glade/delugegtk.glade:826 glade/dgtkpopups.glade:73
+#: glade/delugegtk.glade:904 glade/dgtkpopups.glade:73
 msgid "Share Ratio"
 msgstr ""
 
-#: glade/delugegtk.glade:843
+#: glade/delugegtk.glade:921
 msgid "_Help"
 msgstr ""
 
-#: glade/delugegtk.glade:927
+#: glade/delugegtk.glade:1005
 msgid "Clear Finished Torrents"
 msgstr ""
 
-#: glade/delugegtk.glade:949
+#: glade/delugegtk.glade:1027
 msgid "Start / Pause"
 msgstr ""
 
-#: glade/delugegtk.glade:962
+#: glade/delugegtk.glade:1040
 msgid "Queue Torrent Up"
 msgstr ""
 
-#: glade/delugegtk.glade:975
+#: glade/delugegtk.glade:1053
 msgid "Queue Torrent Down"
 msgstr ""
 
@@ -215,7 +227,7 @@ msgstr ""
 msgid "Add a Torrent..."
 msgstr ""
 
-#: glade/dgtkpopups.glade:191 src/delugegtk.py:175
+#: glade/dgtkpopups.glade:191 src/interface.py:202
 msgid "Clear Finished"
 msgstr ""
 
@@ -231,11 +243,11 @@ msgstr ""
 msgid "Preferences Dialog"
 msgstr ""
 
-#: glade/dgtkpref.glade:53
+#: glade/dgtkpref.glade:53 glade/preferences_dialog.glade:924
 msgid "Enable system tray icon"
 msgstr ""
 
-#: glade/dgtkpref.glade:65
+#: glade/dgtkpref.glade:65 glade/preferences_dialog.glade:935
 msgid "Minimize to tray on close"
 msgstr ""
 
@@ -243,11 +255,11 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: glade/dgtkpref.glade:115
+#: glade/dgtkpref.glade:115 glade/preferences_dialog.glade:73
 msgid "Save all downloads to:"
 msgstr ""
 
-#: glade/dgtkpref.glade:127
+#: glade/dgtkpref.glade:127 glade/preferences_dialog.glade:85
 msgid "Ask me where to save each download"
 msgstr ""
 
@@ -265,7 +277,7 @@ msgstr ""
 msgid "Seeding"
 msgstr ""
 
-#: glade/dgtkpref.glade:209
+#: glade/dgtkpref.glade:209 glade/preferences_dialog.glade:188
 msgid "Use compact storage allocation"
 msgstr ""
 
@@ -277,23 +289,23 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: glade/dgtkpref.glade:280
+#: glade/dgtkpref.glade:280 glade/preferences_dialog.glade:365
 msgid "Try from:"
 msgstr ""
 
-#: glade/dgtkpref.glade:286
+#: glade/dgtkpref.glade:286 glade/preferences_dialog.glade:371
 msgid "to:"
 msgstr ""
 
-#: glade/dgtkpref.glade:320
+#: glade/dgtkpref.glade:320 glade/preferences_dialog.glade:405
 msgid "Active port:"
 msgstr ""
 
-#: glade/dgtkpref.glade:332
+#: glade/dgtkpref.glade:332 glade/preferences_dialog.glade:417
 msgid "0000"
 msgstr ""
 
-#: glade/dgtkpref.glade:343
+#: glade/dgtkpref.glade:343 glade/preferences_dialog.glade:429
 msgid "Test Port"
 msgstr ""
 
@@ -301,27 +313,28 @@ msgstr ""
 msgid "TCP Port"
 msgstr ""
 
-#: glade/dgtkpref.glade:380
+#: glade/dgtkpref.glade:380 glade/preferences_dialog.glade:676
 msgid "<i>(-1 is unlimited)</i>"
 msgstr ""
 
 #: glade/dgtkpref.glade:390 glade/dgtkpref.glade:511
+#: glade/preferences_dialog.glade:686 glade/preferences_dialog.glade:807
 msgid "KB/s"
 msgstr ""
 
-#: glade/dgtkpref.glade:436
+#: glade/dgtkpref.glade:436 glade/preferences_dialog.glade:732
 msgid "Maximum Download Rate:"
 msgstr ""
 
-#: glade/dgtkpref.glade:447
+#: glade/dgtkpref.glade:447 glade/preferences_dialog.glade:743
 msgid "Upload Slots"
 msgstr ""
 
-#: glade/dgtkpref.glade:458
+#: glade/dgtkpref.glade:458 glade/preferences_dialog.glade:754
 msgid "Maximum Connections"
 msgstr ""
 
-#: glade/dgtkpref.glade:485
+#: glade/dgtkpref.glade:485 glade/preferences_dialog.glade:781
 msgid "Maximum Upload Rate:"
 msgstr ""
 
@@ -329,15 +342,15 @@ msgstr ""
 msgid "Bandwidth "
 msgstr ""
 
-#: glade/dgtkpref.glade:576
+#: glade/dgtkpref.glade:576 glade/preferences_dialog.glade:631
 msgid "Network"
 msgstr ""
 
-#: glade/dgtkpref.glade:598
+#: glade/dgtkpref.glade:598 glade/preferences_dialog.glade:1078
 msgid "gtk-cancel"
 msgstr ""
 
-#: glade/dgtkpref.glade:605
+#: glade/dgtkpref.glade:605 glade/preferences_dialog.glade:1085
 msgid "gtk-ok"
 msgstr ""
 
@@ -349,116 +362,284 @@ msgstr ""
 msgid "gtk-close"
 msgstr ""
 
-#: src/dcommon.py:41 src/delugegtk.py:330
+#: glade/preferences_dialog.glade:8
+msgid "Deluge Preferences"
+msgstr ""
+
+#: glade/preferences_dialog.glade:100
+msgid "<b>Download Location</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:150
+msgid "Maximum simultaneous active torrents:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:161
+msgid "<b>Torrents</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:198
+msgid "<b>Compact Allocation</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:248
+msgid "Stop seeding torrents when their share ratio reaches:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:261
+msgid "Queue torrents to bottom when they begin seeding"
+msgstr ""
+
+#: glade/preferences_dialog.glade:276
+msgid "<b>Seeding</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:305
+msgid "Downloads"
+msgstr ""
+
+#: glade/preferences_dialog.glade:334
+msgid ""
+"<b>Warning - Changes to these settings will only be applied the next time "
+"Deluge is restarted</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:446
+msgid "<b>TCP Port</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:475
+msgid "Enable UPnP support"
+msgstr ""
+
+#: glade/preferences_dialog.glade:485
+msgid "<b>UPnP</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:535
+msgid "Max number of DHT connections:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:547
+msgid "Enable Mainline DHT"
+msgstr ""
+
+#: glade/preferences_dialog.glade:562
+msgid "<b>DHT</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:591
+msgid "Enable Peer Exchange"
+msgstr ""
+
+#: glade/preferences_dialog.glade:601
+msgid "<b>PEX</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:847
+msgid "<b>Bandwidth Usage</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:879
+msgid "Bandwidth"
+msgstr ""
+
+#: glade/preferences_dialog.glade:953
+msgid "<b>System Tray</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:986
+msgid "seconds"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1015
+msgid "GUI update interval"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1026
+msgid "<b>Performance</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1056
+msgid "Other"
+msgstr ""
+
+#: glade/torrent_menu.glade:11
+msgid "StartPause"
+msgstr ""
+
+#: glade/torrent_menu.glade:27
+msgid "Update Tracker"
+msgstr ""
+
+#: glade/torrent_menu.glade:44
+msgid "Queue"
+msgstr ""
+
+#: glade/torrent_menu.glade:54
+msgid "Top"
+msgstr ""
+
+#: glade/torrent_menu.glade:69
+msgid "Up"
+msgstr ""
+
+#: glade/torrent_menu.glade:85
+msgid "Down"
+msgstr ""
+
+#: glade/torrent_menu.glade:101
+msgid "Bottom"
+msgstr ""
+
+#: glade/torrent_menu.glade:140
+msgid "menuitem9"
+msgstr ""
+
+#: glade/torrent_menu.glade:170
+msgid "menuitem11"
+msgstr ""
+
+#: src/common.py:44 src/interface.py:288
 msgid "Infinity"
 msgstr ""
 
-#: src/dcommon.py:105
+#: src/common.py:108
 msgid "Error: no webbrowser found"
 msgstr ""
 
-#: src/deluge.py:332
+#: src/core.py:339
 msgid "File was not found"
 msgstr ""
 
-#: src/delugegtk.py:173
+#: src/interface.py:200
 msgid "Show / Hide Window"
 msgstr ""
 
-#: src/delugegtk.py:250
-msgid "Plugin"
-msgstr ""
-
-#: src/delugegtk.py:252
-msgid "Enabled"
-msgstr ""
-
-#: src/delugegtk.py:340
+#: src/interface.py:298
 msgid "Unknown"
 msgstr ""
 
-#: src/delugegtk.py:348
+#: src/interface.py:306
 msgid "Name"
 msgstr ""
 
-#: src/delugegtk.py:356
+#: src/interface.py:314
 msgid "Ratio"
 msgstr ""
 
-#: src/delugegtk.py:465
+#: src/interface.py:383
+msgid "Start"
+msgstr ""
+
+#: src/interface.py:386
+msgid "Pause"
+msgstr ""
+
+#: src/interface.py:430
 msgid "IP Address"
 msgstr ""
 
-#: src/delugegtk.py:466
+#: src/interface.py:431
 msgid "Client"
 msgstr ""
 
-#: src/delugegtk.py:467
+#: src/interface.py:432
 msgid "Percent Complete"
 msgstr ""
 
-#: src/delugegtk.py:468
+#: src/interface.py:433
 msgid "Download Rate"
 msgstr ""
 
-#: src/delugegtk.py:469
+#: src/interface.py:434
 msgid "Upload Rate"
 msgstr ""
 
-#: src/delugegtk.py:478
+#: src/interface.py:443
 msgid "Filename"
 msgstr ""
 
-#: src/delugegtk.py:480
+#: src/interface.py:445
 msgid "Offset"
 msgstr ""
 
-#: src/delugegtk.py:668
+#: src/interface.py:446
+msgid "Progress"
+msgstr ""
+
+#: src/interface.py:571
 msgid ""
 "For some reason, the previous state could not be loaded, so a blank state "
 "has been loaded for you."
 msgstr ""
 
-#: src/delugegtk.py:670
+#: src/interface.py:573
 msgid "Would you like to attempt to reload the previous session's downloads?"
 msgstr ""
 
-#: src/delugegtk.py:679
-msgid "Choose the download directory for"
-msgstr ""
-
-#: src/delugegtk.py:692 src/delugegtk.py:704
+#: src/interface.py:588 src/interface.py:600
 msgid "Connections"
 msgstr ""
 
-#: src/delugegtk.py:703
+#: src/interface.py:599
 msgid "Deluge Bittorrent Client"
 msgstr ""
 
-#: src/delugegtk.py:891
+#: src/interface.py:783
+msgid ""
+"An error occured while trying to add the torrent. It's possible your ."
+"torrent file is corrupted."
+msgstr ""
+
+#: src/interface.py:785
+msgid "The torrent you've added seems to already be in Deluge."
+msgstr ""
+
+#: src/interface.py:789
+msgid "There is not enough free disk space to complete your download."
+msgstr ""
+
+#: src/interface.py:790
+msgid "Space Needed:"
+msgstr ""
+
+#: src/interface.py:791
+msgid "Available Space:"
+msgstr ""
+
+#: src/interface.py:804
 msgid "Add torrent from URL"
 msgstr ""
 
-#: src/delugegtk.py:895
+#: src/interface.py:808
 msgid "Enter the URL of the .torrent to download"
 msgstr ""
 
-#: src/delugegtk.py:959
+#: src/interface.py:872
 msgid "Warning - all downloaded files for this torrent will be deleted!"
 msgstr ""
 
-#: src/dgtk.py:71
+#: src/dialogs.py:116
+msgid "Plugin"
+msgstr ""
+
+#: src/dialogs.py:118
+msgid "Enabled"
+msgstr ""
+
+#: src/dialogs.py:224
 msgid "Choose a .torrent file"
 msgstr ""
 
-#: src/dgtk.py:76
+#: src/dialogs.py:229
 msgid "Torrent files"
 msgstr ""
 
-#: src/dgtk.py:80
+#: src/dialogs.py:233
 msgid "All files"
 msgstr ""
 
-#: src/dgtk.py:97
+#: src/dialogs.py:250
 msgid "Choose a download directory"
 msgstr ""