diff --git a/po/POTFILES.in b/po/POTFILES.in
index 15b91b1b0..9822dd86f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,13 @@
 glade/delugegtk.glade
 glade/dgtkpopups.glade
 glade/file_tab_menu.glade
-glade/file_tab_menu.glade
 glade/merge_dialog.glade
-glade/plugin_dialog.glade
 glade/preferences_dialog.glade
 glade/torrent_menu.glade
 glade/tray_menu.glade
+glade/edit_trackers.glade
+glade/aboutdialog.glade
+glade/files_dialog.glade
 src/tab_details.py
 src/update.py
 src/interface.py
@@ -52,3 +53,7 @@ plugins/TorrentPieces/pieces_preferences.glade
 plugins/TorrentPeers/peers_preferences.glade
 plugins/ExtraStats/__init__.py
 plugins/ExtraStats/stats_preferences.glade
+plugins/MoveTorrent/__init__.py
+plugins/MoveTorrent/movetorrent.glade
+plugins/WebSeed/__init__.py
+plugins/WebSeed/webseed.glade
diff --git a/po/deluge.pot b/po/deluge.pot
index 7d04987cc..a7b1f02d8 100644
--- a/po/deluge.pot
+++ b/po/deluge.pot
@@ -1,9 +1,14 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 17:37-0500\n"
+"POT-Creation-Date: 2007-08-20 21:57-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"
@@ -107,154 +112,141 @@ msgstr ""
 msgid "gtk-select-all"
 msgstr ""
 
-#: glade/delugegtk.glade:851
-msgid "Pl_ugins"
-msgstr ""
-
-#: glade/delugegtk.glade:870
+#: glade/delugegtk.glade:855
 msgid "_Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:877
+#: glade/delugegtk.glade:862
 msgid "_View"
 msgstr ""
 
-#: glade/delugegtk.glade:885
+#: glade/delugegtk.glade:870
 msgid "_Toolbar"
 msgstr ""
 
-#: glade/delugegtk.glade:894
+#: glade/delugegtk.glade:879
 msgid "_Details"
 msgstr ""
 
-#: glade/delugegtk.glade:903
+#: glade/delugegtk.glade:888
 msgid "_Columns"
 msgstr ""
 
-#: glade/delugegtk.glade:911 src/interface.py:558 src/files.py:79
+#: glade/delugegtk.glade:896 src/interface.py:544 src/files.py:80
 msgid "Size"
 msgstr ""
 
-#: glade/delugegtk.glade:920 src/interface.py:559
+#: glade/delugegtk.glade:905 src/interface.py:545
 msgid "Status"
 msgstr ""
 
-#: glade/delugegtk.glade:929 src/interface.py:560
+#: glade/delugegtk.glade:914 src/interface.py:546
 msgid "Seeders"
 msgstr ""
 
-#: glade/delugegtk.glade:938 src/interface.py:561
+#: glade/delugegtk.glade:923 src/interface.py:547
 #: plugins/TorrentPeers/__init__.py:69
 msgid "Peers"
 msgstr ""
 
-#: glade/delugegtk.glade:947 src/interface.py:562 src/interface.py:1002
-#: src/interface.py:1015 plugins/TorrentPeers/tab_peers.py:44
+#: glade/delugegtk.glade:932 src/interface.py:548 src/interface.py:975
+#: src/interface.py:998 plugins/TorrentPeers/tab_peers.py:57
 msgid "Down Speed"
 msgstr ""
 
-#: glade/delugegtk.glade:956 src/interface.py:563 src/interface.py:1003
-#: src/interface.py:1016 plugins/TorrentPeers/tab_peers.py:46
+#: glade/delugegtk.glade:941 src/interface.py:549 src/interface.py:976
+#: src/interface.py:999 plugins/TorrentPeers/tab_peers.py:59
 msgid "Up Speed"
 msgstr ""
 
-#: glade/delugegtk.glade:965
+#: glade/delugegtk.glade:950
 msgid "Time Remaining"
 msgstr ""
 
-#: glade/delugegtk.glade:974
+#: glade/delugegtk.glade:959
 msgid "Availability"
 msgstr ""
 
-#: glade/delugegtk.glade:983
+#: glade/delugegtk.glade:968
 msgid "Share Ratio"
 msgstr ""
 
-#: glade/delugegtk.glade:1000
+#: glade/delugegtk.glade:985
 msgid "_Help"
 msgstr ""
 
-#: glade/delugegtk.glade:1008
+#: glade/delugegtk.glade:993
 msgid "Help translate this application"
 msgstr ""
 
-#: glade/delugegtk.glade:1009
+#: glade/delugegtk.glade:994
 msgid "_Translate This Application..."
 msgstr ""
 
-#: glade/delugegtk.glade:1082
+#: glade/delugegtk.glade:1067
 msgid "Add Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:1083
+#: glade/delugegtk.glade:1068
 msgid "Add"
 msgstr ""
 
-#: glade/delugegtk.glade:1096 glade/dgtkpopups.glade:6
+#: glade/delugegtk.glade:1081 glade/dgtkpopups.glade:6
 msgid "Remove Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:1097
+#: glade/delugegtk.glade:1082
 msgid "Remove"
 msgstr ""
 
-#: glade/delugegtk.glade:1109
+#: glade/delugegtk.glade:1094
 msgid "Clear Finished Torrents"
 msgstr ""
 
-#: glade/delugegtk.glade:1110
+#: glade/delugegtk.glade:1095
 msgid "Clear"
 msgstr ""
 
-#: glade/delugegtk.glade:1132
+#: glade/delugegtk.glade:1117
 msgid "Start or Pause torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:1133
+#: glade/delugegtk.glade:1118
 msgid "Resume"
 msgstr ""
 
-#: glade/delugegtk.glade:1146
+#: glade/delugegtk.glade:1131
 msgid "Pause"
 msgstr ""
 
-#: glade/delugegtk.glade:1158
+#: glade/delugegtk.glade:1143
 msgid "Queue Torrent Up"
 msgstr ""
 
-#: glade/delugegtk.glade:1159
+#: glade/delugegtk.glade:1144
 msgid "Up"
 msgstr ""
 
-#: glade/delugegtk.glade:1172
+#: glade/delugegtk.glade:1157
 msgid "Queue Torrent Down"
 msgstr ""
 
-#: glade/delugegtk.glade:1173
+#: glade/delugegtk.glade:1158
 msgid "Down"
 msgstr ""
 
-#: glade/delugegtk.glade:1194
+#: glade/delugegtk.glade:1179
 msgid "Change Deluge preferences"
 msgstr ""
 
-#: glade/delugegtk.glade:1195
+#: glade/delugegtk.glade:1180
 msgid "Preferences"
 msgstr ""
 
-#: glade/delugegtk.glade:1207
-msgid "Open the plugins dialog"
-msgstr ""
-
-#: glade/delugegtk.glade:1208 glade/dgtkpopups.glade:209
-#: glade/plugin_dialog.glade:106
-msgid "Plugins"
-msgstr ""
-
 #: glade/dgtkpopups.glade:41
 msgid ""
-"<span size=\"large\"><b>Are you sure you want to remove the selected "
-"torrent(s) from Deluge?</b></span>"
+"<span size=\"large\"><b>Are you sure you want to remove the selected torrent"
+"(s) from Deluge?</b></span>"
 msgstr ""
 
 #: glade/dgtkpopups.glade:65
@@ -277,6 +269,10 @@ msgstr ""
 msgid "Clear Finished"
 msgstr ""
 
+#: glade/dgtkpopups.glade:209 glade/preferences_dialog.glade:2713
+msgid "Plugins"
+msgstr ""
+
 #: glade/dgtkpopups.glade:241
 msgid "Speed"
 msgstr ""
@@ -319,296 +315,292 @@ msgid ""
 "lists?"
 msgstr ""
 
-#: glade/plugin_dialog.glade:8
-msgid "Plugin Manager"
-msgstr ""
-
 #: glade/preferences_dialog.glade:9
 msgid "Deluge Preferences"
 msgstr ""
 
-#: glade/preferences_dialog.glade:57
+#: glade/preferences_dialog.glade:59
 msgid "Ask where to save each download"
 msgstr ""
 
-#: glade/preferences_dialog.glade:74 glade/preferences_dialog.glade:75
+#: glade/preferences_dialog.glade:76 glade/preferences_dialog.glade:77
 msgid "Store all downloads in:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:89
-msgid "Move completed downloads to (*same partition only*):"
-msgstr ""
-
-#: glade/preferences_dialog.glade:90
-msgid "Move completed downloads to:"
-msgstr ""
-
-#: glade/preferences_dialog.glade:106 glade/preferences_dialog.glade:119
+#: glade/preferences_dialog.glade:91 plugins/MoveTorrent/movetorrent.glade:35
 msgid "Select A Folder"
 msgstr ""
 
-#: glade/preferences_dialog.glade:140
+#: glade/preferences_dialog.glade:110
 msgid "<b>Download Location</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:175 glade/preferences_dialog.glade:188
+#: glade/preferences_dialog.glade:145 glade/preferences_dialog.glade:158
 msgid ""
 "The number of active torrents that Deluge will run.  Set to -1 for unlimited."
 msgstr ""
 
-#: glade/preferences_dialog.glade:177
+#: glade/preferences_dialog.glade:147
 msgid "Maximum simultaneous active torrents:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:208 glade/preferences_dialog.glade:209
+#: glade/preferences_dialog.glade:178 glade/preferences_dialog.glade:179
 msgid "Enable selecting files for torrents before loading"
 msgstr ""
 
-#: glade/preferences_dialog.glade:223 glade/preferences_dialog.glade:224
+#: glade/preferences_dialog.glade:193 glade/preferences_dialog.glade:194
 msgid "Prioritize first and last pieces of files in torrent"
 msgstr ""
 
-#: glade/preferences_dialog.glade:240
+#: glade/preferences_dialog.glade:210
 msgid "<b>Torrents</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:269
+#: glade/preferences_dialog.glade:249
 msgid ""
-"Compact allocation will only allocate as much storage as it needs to keep "
-"the pieces downloaded so far."
+"Full allocation preallocates all of the space that is needed for the torrent "
+"and prevents disk fragmentation"
 msgstr ""
 
-#: glade/preferences_dialog.glade:270
-msgid "Use compact storage allocation"
+#: glade/preferences_dialog.glade:250
+msgid "Use Full Allocation"
 msgstr ""
 
-#: glade/preferences_dialog.glade:281
-msgid "<b>Compact Allocation</b>"
+#: glade/preferences_dialog.glade:272
+msgid "Compact allocation only allocates space as needed"
 msgstr ""
 
-#: glade/preferences_dialog.glade:308
+#: glade/preferences_dialog.glade:273
+msgid "Use Compact Allocation"
+msgstr ""
+
+#: glade/preferences_dialog.glade:293
+msgid "<b>Allocation</b>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:320
 msgid "Downloads"
 msgstr ""
 
-#: glade/preferences_dialog.glade:353
+#: glade/preferences_dialog.glade:365
 msgid ""
 "<b>Please Note - Changes to these settings will only be applied the next "
 "time Deluge is restarted.</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:396
+#: glade/preferences_dialog.glade:408
 msgid "From:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:419
+#: glade/preferences_dialog.glade:431
 msgid "To:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:445
+#: glade/preferences_dialog.glade:457
 msgid "Deluge will automatically choose a different port to use every time."
 msgstr ""
 
-#: glade/preferences_dialog.glade:446
+#: glade/preferences_dialog.glade:458
 msgid "Random Ports"
 msgstr ""
 
-#: glade/preferences_dialog.glade:463
+#: glade/preferences_dialog.glade:475
 msgid "Test Active Port"
 msgstr ""
 
-#: glade/preferences_dialog.glade:489
+#: glade/preferences_dialog.glade:501
 msgid "<b>TCP</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:501
+#: glade/preferences_dialog.glade:513
 msgid "Active Port:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:514
+#: glade/preferences_dialog.glade:526
 msgid "0000"
 msgstr ""
 
-#: glade/preferences_dialog.glade:553
+#: glade/preferences_dialog.glade:565
 msgid "Distributed hash table may improve the amount of active connections."
 msgstr ""
 
-#: glade/preferences_dialog.glade:554
+#: glade/preferences_dialog.glade:566
 msgid "Enable Mainline DHT"
 msgstr ""
 
-#: glade/preferences_dialog.glade:567
+#: glade/preferences_dialog.glade:579
 msgid "<b>DHT</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:602
+#: glade/preferences_dialog.glade:614
 msgid "Universal Plug and Play"
 msgstr ""
 
-#: glade/preferences_dialog.glade:603
+#: glade/preferences_dialog.glade:615
 msgid "UPnP"
 msgstr ""
 
-#: glade/preferences_dialog.glade:617
+#: glade/preferences_dialog.glade:629
 msgid "NAT Port Mapping Protocol"
 msgstr ""
 
-#: glade/preferences_dialog.glade:618
+#: glade/preferences_dialog.glade:630
 msgid "NAT-PMP"
 msgstr ""
 
-#: glade/preferences_dialog.glade:633
+#: glade/preferences_dialog.glade:645
 msgid "µTorrent Peer-Exchange"
 msgstr ""
 
-#: glade/preferences_dialog.glade:634
+#: glade/preferences_dialog.glade:646
 msgid "µTorrent-PeX"
 msgstr ""
 
-#: glade/preferences_dialog.glade:652
+#: glade/preferences_dialog.glade:664
 msgid "<b>Network Extras</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:693
+#: glade/preferences_dialog.glade:705
 msgid "Inbound:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:702 glade/preferences_dialog.glade:724
+#: glade/preferences_dialog.glade:714 glade/preferences_dialog.glade:736
 msgid ""
 "Disabled\n"
 "Enabled\n"
 "Forced"
 msgstr ""
 
-#: glade/preferences_dialog.glade:715
+#: glade/preferences_dialog.glade:727
 msgid "Outbound:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:742
+#: glade/preferences_dialog.glade:754
 msgid "Prefer to encrypt the entire stream"
 msgstr ""
 
-#: glade/preferences_dialog.glade:755
+#: glade/preferences_dialog.glade:767
 msgid "Level:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:764
+#: glade/preferences_dialog.glade:776
 msgid ""
 "Handshake\n"
 "Either\n"
 "Full Stream"
 msgstr ""
 
-#: glade/preferences_dialog.glade:785
+#: glade/preferences_dialog.glade:797
 msgid "<b>Encryption</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:816
+#: glade/preferences_dialog.glade:828
 msgid "Network"
 msgstr ""
 
-#: glade/preferences_dialog.glade:860
+#: glade/preferences_dialog.glade:870
 msgid "Queue torrents to bottom when they begin seeding"
 msgstr ""
 
-#: glade/preferences_dialog.glade:872
+#: glade/preferences_dialog.glade:882
 msgid "Queue new torrents above completed ones"
 msgstr ""
 
-#: glade/preferences_dialog.glade:888
+#: glade/preferences_dialog.glade:898
 msgid "Stop seeding torrents when their share ratio reaches:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:924
+#: glade/preferences_dialog.glade:934
 msgid "Automatically clear torrents that reach the max share ratio"
 msgstr ""
 
-#: glade/preferences_dialog.glade:940
+#: glade/preferences_dialog.glade:950
 msgid "<b>Seeding</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:971 src/core.py:90
+#: glade/preferences_dialog.glade:980 src/core.py:90
 msgid "Seeding"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1018
-msgid "The maximum upload slots for all torrents.  Set -1 for unlimited."
-msgstr ""
-
-#: glade/preferences_dialog.glade:1035 glade/preferences_dialog.glade:1119
-#: glade/preferences_dialog.glade:1139
+#: glade/preferences_dialog.glade:1031 glade/preferences_dialog.glade:1051
+#: glade/preferences_dialog.glade:1130
 msgid "The maximum upload speed for all torrents.  Set -1 for unlimited."
 msgstr ""
 
-#: glade/preferences_dialog.glade:1053 glade/preferences_dialog.glade:1069
-msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
-msgstr ""
-
-#: glade/preferences_dialog.glade:1071
-msgid "Maximum Download Speed (KiB/s):"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1082 glade/preferences_dialog.glade:1101
-msgid "The maximum number of connections allowed.  Set -1 for unlimited."
-msgstr ""
-
-#: glade/preferences_dialog.glade:1103 glade/preferences_dialog.glade:1249
-msgid "Maximum Connections:"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1121
-msgid "Maximum Upload Speed (KiB/s):"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1141 glade/preferences_dialog.glade:1231
+#: glade/preferences_dialog.glade:1033 glade/preferences_dialog.glade:1223
 msgid "Maximum Upload Slots:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1158
+#: glade/preferences_dialog.glade:1053
+msgid "Maximum Upload Speed (KiB/s):"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1071 glade/preferences_dialog.glade:1085
+msgid "The maximum number of connections allowed.  Set -1 for unlimited."
+msgstr ""
+
+#: glade/preferences_dialog.glade:1073 glade/preferences_dialog.glade:1209
+msgid "Maximum Connections:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1099 glade/preferences_dialog.glade:1113
+msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
+msgstr ""
+
+#: glade/preferences_dialog.glade:1101
+msgid "Maximum Download Speed (KiB/s):"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1147
+msgid "The maximum upload slots for all torrents.  Set -1 for unlimited."
+msgstr ""
+
+#: glade/preferences_dialog.glade:1167
 msgid "<b>Global Bandwidth Usage</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1195
-msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
-msgstr ""
-
-#: glade/preferences_dialog.glade:1212
+#: glade/preferences_dialog.glade:1236
 msgid "The maximum number of connections per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: glade/preferences_dialog.glade:1262
+#: glade/preferences_dialog.glade:1250
+msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
+msgstr ""
+
+#: glade/preferences_dialog.glade:1271
 msgid "<b>Per Torrent Bandwidth Usage</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1289
+#: glade/preferences_dialog.glade:1298
 msgid "Bandwidth"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1320 glade/preferences_dialog.glade:1514
-#: glade/preferences_dialog.glade:1709 glade/preferences_dialog.glade:1904
+#: glade/preferences_dialog.glade:1342 glade/preferences_dialog.glade:1536
+#: glade/preferences_dialog.glade:1731 glade/preferences_dialog.glade:1926
 msgid "Affects regular bittorrent peers"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1321
+#: glade/preferences_dialog.glade:1343 glade/preferences_dialog.glade:1506
 msgid "Peer Proxy"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1363 glade/preferences_dialog.glade:1557
-#: glade/preferences_dialog.glade:1752 glade/preferences_dialog.glade:1947
+#: glade/preferences_dialog.glade:1385 glade/preferences_dialog.glade:1579
+#: glade/preferences_dialog.glade:1774 glade/preferences_dialog.glade:1969
 msgid "Proxy type"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1370 glade/preferences_dialog.glade:1564
-#: glade/preferences_dialog.glade:1759 glade/preferences_dialog.glade:1954
+#: glade/preferences_dialog.glade:1392 glade/preferences_dialog.glade:1586
+#: glade/preferences_dialog.glade:1781 glade/preferences_dialog.glade:1976
 msgid "Username"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1381 glade/preferences_dialog.glade:1575
-#: glade/preferences_dialog.glade:1770 glade/preferences_dialog.glade:1965
+#: glade/preferences_dialog.glade:1403 glade/preferences_dialog.glade:1597
+#: glade/preferences_dialog.glade:1792 glade/preferences_dialog.glade:1987
 msgid "Password"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1393 glade/preferences_dialog.glade:1587
-#: glade/preferences_dialog.glade:1782 glade/preferences_dialog.glade:1977
+#: glade/preferences_dialog.glade:1415 glade/preferences_dialog.glade:1609
+#: glade/preferences_dialog.glade:1804 glade/preferences_dialog.glade:1999
 msgid ""
 "None\n"
 "Socksv4\n"
@@ -618,126 +610,119 @@ msgid ""
 "HTTP W/ Auth"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1438 glade/preferences_dialog.glade:1632
-#: glade/preferences_dialog.glade:1827 glade/preferences_dialog.glade:2022
+#: glade/preferences_dialog.glade:1460 glade/preferences_dialog.glade:1654
+#: glade/preferences_dialog.glade:1849 glade/preferences_dialog.glade:2044
 msgid "Server"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1449 glade/preferences_dialog.glade:1643
-#: glade/preferences_dialog.glade:1838 glade/preferences_dialog.glade:2033
+#: glade/preferences_dialog.glade:1471 glade/preferences_dialog.glade:1665
+#: glade/preferences_dialog.glade:1860 glade/preferences_dialog.glade:2055
 msgid "Port"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1483
-msgid "<b>Peer Proxy</b>"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1515
+#: glade/preferences_dialog.glade:1537 glade/preferences_dialog.glade:1700
 msgid "Tracker Proxy"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1677
-msgid "<b>Tracker Proxy</b>"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1710
+#: glade/preferences_dialog.glade:1732 glade/preferences_dialog.glade:1895
 msgid "DHT Proxy"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1872
-msgid "<b>DHT Proxy</b>"
-msgstr ""
-
-#: glade/preferences_dialog.glade:1905
+#: glade/preferences_dialog.glade:1927 glade/preferences_dialog.glade:2090
 msgid "Web Seed Proxy"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2067
-msgid "<b>Web Seed Proxy</b>"
-msgstr ""
-
-#: glade/preferences_dialog.glade:2094
+#: glade/preferences_dialog.glade:2120
 msgid "Proxies"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2135
+#: glade/preferences_dialog.glade:2150
 msgid "Enable system tray icon"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2151
+#: glade/preferences_dialog.glade:2166
 msgid "Minimize to tray on close"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2175
+#: glade/preferences_dialog.glade:2185
+msgid "Start in tray"
+msgstr ""
+
+#: glade/preferences_dialog.glade:2209
 msgid "Password protect system tray"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2193
+#: glade/preferences_dialog.glade:2227
 msgid "Password:"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2235
+#: glade/preferences_dialog.glade:2269
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2278
-msgid "Open folder with:"
-msgstr ""
-
-#: glade/preferences_dialog.glade:2295
-msgid "Custom:"
-msgstr ""
-
-#: glade/preferences_dialog.glade:2318
+#: glade/preferences_dialog.glade:2333
 msgid ""
+"Auto-detect (xdg-open)\n"
 "Konqueror\n"
 "Nautilus\n"
 "Thunar"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2373
+#: glade/preferences_dialog.glade:2363
+msgid "Custom:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:2386
+msgid "Open folder with:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:2408
 msgid "<b>Desktop File Manager</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2406
+#: glade/preferences_dialog.glade:2441
 msgid "GUI update interval (seconds)"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2434
+#: glade/preferences_dialog.glade:2469
 msgid "<b>Performance</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2469
+#: glade/preferences_dialog.glade:2504
 msgid ""
 "Deluge will check our servers and will tell you if a newer version has been "
 "released"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2470
+#: glade/preferences_dialog.glade:2505
 msgid "Be alerted about new releases"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2487
+#: glade/preferences_dialog.glade:2522
 msgid "<b>Updates</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2517
+#: glade/preferences_dialog.glade:2552
 msgid ""
 "Help us improve Deluge by sending us your Python and PyGTK\n"
 "versions, OS and processor types.  Absolutely no other\n"
 "information is sent."
 msgstr ""
 
-#: glade/preferences_dialog.glade:2530
+#: glade/preferences_dialog.glade:2565
 msgid "<b>System Information</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:2557
+#: glade/preferences_dialog.glade:2589
 #: plugins/EventLogging/event_logging_preferences.glade:52
 #: plugins/EventLogging/tab_log.py:186
 msgid "Other"
 msgstr ""
 
+#: glade/preferences_dialog.glade:2684
+msgid "gtk-preferences"
+msgstr ""
+
 #: glade/torrent_menu.glade:11
 msgid "Re_sume"
 msgstr ""
@@ -802,7 +787,7 @@ msgstr ""
 msgid "Global _Up Speed Limit"
 msgstr ""
 
-#: glade/tray_menu.glade:138
+#: glade/tray_menu.glade:128
 msgid "Plu_gins"
 msgstr ""
 
@@ -810,141 +795,151 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
+#: glade/edit_trackers.glade:9
+msgid "Edit Trackers"
+msgstr ""
+
+#: glade/edit_trackers.glade:19
+msgid "Tracker Editing"
+msgstr ""
+
+#: glade/files_dialog.glade:8
+msgid "Deluge File Selection"
+msgstr ""
+
+#: glade/files_dialog.glade:42
+msgid "Torrent will not be distributed on the trackerless (DHT) network"
+msgstr ""
+
+#: glade/files_dialog.glade:43
+msgid "Set the private flag"
+msgstr ""
+
 #: src/update.py:21
 msgid ""
 "There is a newer version of Deluge.  Would you like to be taken to our "
 "download site?"
 msgstr ""
 
-#: src/interface.py:252 src/interface.py:258 src/interface.py:334
-#: src/interface.py:358 plugins/SpeedLimiter/__init__.py:63
+#: src/interface.py:239 src/interface.py:245 src/interface.py:321
+#: src/interface.py:345 plugins/SpeedLimiter/__init__.py:63
 #: plugins/SpeedLimiter/__init__.py:73 plugins/SpeedLimiter/__init__.py:118
 #: plugins/SpeedLimiter/__init__.py:149
 msgid "KiB/s"
 msgstr ""
 
-#: src/interface.py:276 src/interface.py:335 src/interface.py:359
-#: src/interface.py:983 src/interface.py:992 src/interface.py:996
+#: src/interface.py:263 src/interface.py:322 src/interface.py:346
+#: src/interface.py:958 src/interface.py:965 src/interface.py:969
 #: plugins/SpeedLimiter/__init__.py:119 plugins/SpeedLimiter/__init__.py:150
 msgid "Unlimited"
 msgstr ""
 
-#: src/interface.py:279
+#: src/interface.py:266
 msgid "Activated"
 msgstr ""
 
-#: src/interface.py:327 src/interface.py:338 src/interface.py:362
+#: src/interface.py:314 src/interface.py:325 src/interface.py:349
 #: plugins/DesiredRatio/__init__.py:102 plugins/SpeedLimiter/__init__.py:122
 #: plugins/SpeedLimiter/__init__.py:153
 msgid "Other..."
 msgstr ""
 
-#: src/interface.py:342
+#: src/interface.py:329
 msgid "Download Speed (KiB/s):"
 msgstr ""
 
-#: src/interface.py:366
+#: src/interface.py:353
 msgid "Upload Speed (KiB/s):"
 msgstr ""
 
-#: src/interface.py:395
+#: src/interface.py:382
 msgid "Deluge is locked"
 msgstr ""
 
-#: src/interface.py:397
+#: src/interface.py:384
 msgid ""
 "Deluge is password protected.\n"
 "To show the Deluge window, please enter your password"
 msgstr ""
 
-#: src/interface.py:531 src/common.py:53
+#: src/interface.py:517 src/common.py:53
 msgid "Infinity"
 msgstr ""
 
-#: src/interface.py:543
+#: src/interface.py:529
 msgid "Unknown"
 msgstr ""
 
-#: src/interface.py:557 plugins/SimpleRSS/plugin.py:37
+#: src/interface.py:543 plugins/SimpleRSS/plugin.py:37
 #: plugins/SimpleRSS/plugin.py:45 plugins/SimpleRSS/plugin.py:52
 #: plugins/TorrentSearch/plugin.py:20
 msgid "Name"
 msgstr ""
 
-#: src/interface.py:564
+#: src/interface.py:550
 msgid "ETA"
 msgstr ""
 
-#: src/interface.py:565
+#: src/interface.py:551
 msgid "Avail."
 msgstr ""
 
-#: src/interface.py:566
+#: src/interface.py:552
 msgid "Ratio"
 msgstr ""
 
-#: src/interface.py:776
+#: src/interface.py:753
 #, python-format
 msgid "Paused %s"
 msgstr ""
 
-#: src/interface.py:885 src/core.py:613
-msgid ""
-"You cannot move torrent to a different partition.  Please fix your "
-"preferences"
-msgstr ""
-
-#: src/interface.py:1002
+#: src/interface.py:975
 msgid "Connections"
 msgstr ""
 
-#: src/interface.py:1012
+#: src/interface.py:995
 msgid "DHT"
 msgstr ""
 
-#: src/interface.py:1015
+#: src/interface.py:998
 msgid "Deluge Bittorrent Client"
 msgstr ""
 
-#: src/interface.py:1016
-msgid "Total Downloaded"
+#: src/interface.py:1069
+msgid "Choose a download directory"
 msgstr ""
 
-#: src/interface.py:1017
-msgid "Total Uploaded"
-msgstr ""
-
-#: src/interface.py:1111
+#: src/interface.py:1096
 msgid ""
-"An error occured while trying to add the torrent. It's possible your "
-".torrent file is corrupted."
+"An error occured while trying to add the torrent. It's possible your ."
+"torrent file is corrupted."
 msgstr ""
 
-#: src/interface.py:1129
+#: src/interface.py:1114
 msgid "Unknown duplicate torrent error."
 msgstr ""
 
-#: src/interface.py:1133
+#: src/interface.py:1118
 msgid "There is not enough free disk space to complete your download."
 msgstr ""
 
-#: src/interface.py:1134
+#: src/interface.py:1119
 msgid "Space Needed:"
 msgstr ""
 
-#: src/interface.py:1135
+#: src/interface.py:1120
 msgid "Available Space:"
 msgstr ""
 
-#: src/interface.py:1149
+#: src/interface.py:1136
 msgid "Add torrent from URL"
 msgstr ""
 
-#: src/interface.py:1153
+#: src/interface.py:1140
 msgid "Enter the URL of the .torrent to download"
 msgstr ""
 
-#: src/interface.py:1205
+#: src/interface.py:1192
 msgid "Warning - all downloaded files for this torrent will be deleted!"
 msgstr ""
 
@@ -976,85 +971,98 @@ msgstr ""
 msgid "Allocating"
 msgstr ""
 
-#: src/core.py:137
+#: src/core.py:134
 msgid "bytes needed"
 msgstr ""
 
-#: src/core.py:384
+#: src/core.py:383
 msgid "File was not found"
 msgstr ""
 
-#: src/core.py:432
+#: src/core.py:431
 msgid "Asked for a torrent that doesn't exist"
 msgstr ""
 
-#: src/core.py:638
+#: src/core.py:632
 msgid "Announce sent"
 msgstr ""
 
-#: src/core.py:642
+#: src/core.py:636
 msgid "Announce OK"
 msgstr ""
 
-#: src/core.py:648
+#: src/core.py:642
 msgid "Alert"
 msgstr ""
 
-#: src/core.py:649
+#: src/core.py:643
 msgid "HTTP code"
 msgstr ""
 
-#: src/core.py:650
+#: src/core.py:644
 msgid "times in a row"
 msgstr ""
 
-#: src/core.py:657
+#: src/core.py:651
 msgid "Warning"
 msgstr ""
 
-#: src/files.py:76
+#: src/files.py:78
 msgid "Filename"
 msgstr ""
 
-#: src/files.py:81
+#: src/files.py:82
 msgid "Priority"
 msgstr ""
 
-#: src/files.py:103
+#: src/files.py:104
 msgid ""
 "File priority can only be set when using full allocation.\n"
 "Please change your preference to disable compact allocation, then remove and "
 "readd this torrent."
 msgstr ""
 
-#: src/dialogs.py:362
+#: src/dialogs.py:67
 msgid "Plugin"
 msgstr ""
 
-#: src/dialogs.py:364
+#: src/dialogs.py:69
 msgid "Enabled"
 msgstr ""
 
-#: src/dialogs.py:437
+#: src/dialogs.py:413
 msgid "translator-credits"
 msgstr ""
 
-#: src/dialogs.py:477
+#: src/dialogs.py:414
+msgid ""
+"Deluge is free software, you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public\n"
+" License as published by the Free Software Foundation,\n"
+"either version 2 of the License, or (at your option) any\n"
+"later version.  Deluge is distributed in the hope that it\n"
+"will be useful, but WITHOUT ANY WARRANTY, without even \n"
+"the implied warranty of MERCHANTABILITY or FITNESS\n"
+"FOR A PARTICULAR PURPOSE.  See the GNU General\n"
+"Public License for more details.  You should have received\n"
+"a copy of the GNU General Public License along with\n"
+"Deluge, but if not, write to the Free Software Foundation,\n"
+" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-\n"
+"1301 USA"
+msgstr ""
+
+#: src/dialogs.py:454
 msgid "Choose a .torrent file"
 msgstr ""
 
-#: src/dialogs.py:482
+#: src/dialogs.py:459
 msgid "Torrent files"
 msgstr ""
 
-#: src/dialogs.py:486
+#: src/dialogs.py:463
 msgid "All files"
 msgstr ""
 
-#: src/dialogs.py:507
-msgid "Choose a download directory"
-msgstr ""
-
 #: src/common.py:67
 msgid "KiB"
 msgstr ""
@@ -1075,6 +1083,14 @@ msgstr ""
 msgid "PiB"
 msgstr ""
 
+#: src/common.py:168
+msgid "External command"
+msgstr ""
+
+#: src/common.py:169
+msgid "not found"
+msgstr ""
+
 #: plugins/BlocklistImport/__init__.py:6
 msgid "Blocklist Importer"
 msgstr ""
@@ -1205,15 +1221,15 @@ msgid ""
 "This is just the peers tab as a plugin.\n"
 msgstr ""
 
-#: plugins/TorrentPeers/tab_peers.py:39
+#: plugins/TorrentPeers/tab_peers.py:52
 msgid "IP Address"
 msgstr ""
 
-#: plugins/TorrentPeers/tab_peers.py:41
+#: plugins/TorrentPeers/tab_peers.py:54
 msgid "Client"
 msgstr ""
 
-#: plugins/TorrentPeers/tab_peers.py:42
+#: plugins/TorrentPeers/tab_peers.py:55
 msgid "Percent Complete"
 msgstr ""
 
@@ -1727,7 +1743,7 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: plugins/TorrentSearch/searchdlg.glade:91
+#: plugins/TorrentSearch/searchdlg.glade:91 plugins/WebSeed/webseed.glade:28
 msgid "URL:"
 msgstr ""
 
@@ -1757,7 +1773,7 @@ msgid ""
 "Written by Kripkenstein"
 msgstr ""
 
-#: plugins/NetworkGraph/__init__.py:37
+#: plugins/NetworkGraph/__init__.py:57
 msgid "Graph"
 msgstr ""
 
@@ -1826,46 +1842,6 @@ msgid ""
 "This is just the files tab as a plugin.\n"
 msgstr ""
 
-#: plugins/AlltimeStats/__init__.py:19
-msgid "Alltime Stats"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:22
-msgid ""
-"\n"
-"Shows alltime stats in the tray tooltip.\n"
-"Tracks transfer amounts, ratio, number of torrents finished, and uptime.\n"
-"Also show session uptime\n"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:93 plugins/AlltimeStats/__init__.py:131
-msgid "Undefined"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:97 plugins/AlltimeStats/__init__.py:135
-msgid "Uptime"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:98 plugins/AlltimeStats/__init__.py:136
-msgid "All-time Downloaded"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:99 plugins/AlltimeStats/__init__.py:137
-msgid "All-time Uploaded"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:100 plugins/AlltimeStats/__init__.py:138
-msgid "All-time Ratio"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:101 plugins/AlltimeStats/__init__.py:139
-msgid "Torrents completed"
-msgstr ""
-
-#: plugins/AlltimeStats/__init__.py:102 plugins/AlltimeStats/__init__.py:140
-msgid "All-time Uptime"
-msgstr ""
-
 #: plugins/TorrentPieces/pieces_preferences.glade:7
 msgid "Pieces Preferences"
 msgstr ""
@@ -1896,4 +1872,116 @@ msgstr ""
 
 #: plugins/TorrentPeers/peers_preferences.glade:62
 msgid "25x15"
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:19
+msgid "Extra Stats"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:22
+msgid ""
+"\n"
+"Adds info to tray tooltip.\n"
+"Adds these stats.\n"
+"total bytes downloaded\n"
+"total bytes uploaded\n"
+"overall ratio\n"
+"torrents completed\n"
+"\n"
+"All of these stats come in pairs:\n"
+"across sessions stat and within session stat.\n"
+"By default, all pairs enabled, but can be disabled in plugin preferences.\n"
+"\n"
+"session data always shows up within parenthesis\n"
+"eg.  Total Downloaded: 5 GiB (4 MiB)\n"
+"would be 5 GiB across sessions and 4 MiB within session\n"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:175
+#: plugins/ExtraStats/stats_preferences.glade:28
+msgid "Total Downloaded"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:181
+#: plugins/ExtraStats/stats_preferences.glade:38
+msgid "Total Uploaded"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:187 plugins/ExtraStats/__init__.py:191
+msgid "Undefined"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:195
+#: plugins/ExtraStats/stats_preferences.glade:52
+msgid "Overall Ratio"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:200
+#: plugins/ExtraStats/stats_preferences.glade:66
+msgid "Torrents Completed"
+msgstr ""
+
+#: plugins/ExtraStats/__init__.py:206
+#: plugins/ExtraStats/stats_preferences.glade:80
+msgid "Running Time"
+msgstr ""
+
+#: plugins/ExtraStats/stats_preferences.glade:7
+msgid "Extra Stats Preferences"
+msgstr ""
+
+#: plugins/MoveTorrent/__init__.py:19
+msgid "Move Torrent"
+msgstr ""
+
+#: plugins/MoveTorrent/__init__.py:22
+msgid ""
+"This plugin allows users to move the torrent to a     different directory "
+"without having to remove and re-add the torrent.  This     feature can be "
+"found by right-clicking on a torrent.\n"
+"Furthermore, it     allows the user to automatically have finished torrents "
+"moved to a different     folder."
+msgstr ""
+
+#: plugins/MoveTorrent/__init__.py:76
+msgid "_Move Torrent"
+msgstr ""
+
+#: plugins/MoveTorrent/__init__.py:95
+msgid "Choose a directory to move files to"
+msgstr ""
+
+#: plugins/MoveTorrent/__init__.py:123
+msgid ""
+"You cannot move torrent to a different partition. Please check your "
+"preferences. Or perhalps you are trying to move torrent's files to the same "
+"directory they are already stored?"
+msgstr ""
+
+#: plugins/MoveTorrent/movetorrent.glade:25
+msgid "Move completed downloads to:"
+msgstr ""
+
+#: plugins/MoveTorrent/movetorrent.glade:59 plugins/WebSeed/webseed.glade:64
+msgid "gtk-cancel"
+msgstr ""
+
+#: plugins/MoveTorrent/movetorrent.glade:71 plugins/WebSeed/webseed.glade:72
+msgid "gtk-ok"
+msgstr ""
+
+#: plugins/WebSeed/__init__.py:19
+msgid "Web Seed"
+msgstr ""
+
+#: plugins/WebSeed/__init__.py:22
+msgid "This plugin allows users to add web seeds to their torrents"
+msgstr ""
+
+#: plugins/WebSeed/__init__.py:50
+msgid "_Add Web Seed"
+msgstr ""
+
+#: plugins/WebSeed/webseed.glade:7
+msgid "Open Containing Folder Preferences"
+msgstr ""