diff --git a/plugins/WebUi/scripts/build_webui_tarball.sh b/plugins/WebUi/scripts/build_webui_tarball.sh
index 96e33164a..5de6448dc 100644
--- a/plugins/WebUi/scripts/build_webui_tarball.sh
+++ b/plugins/WebUi/scripts/build_webui_tarball.sh
@@ -4,4 +4,4 @@ bzr revno > revno
 bzr version-info > version
 rm ~/prj/WebUi/WebUi.tgz
 cd ~/prj
-tar -zcvf ~/prj/WebUi/WebUi.tgz WebUi/ --exclude '.*' --exclude '*.pyc' --exclude '*.tgz' --exclude 'attic' --exclude 'xul' --exclude '*.sh' --exclude '*.*~'
+tar -zcvf ~/prj/WebUi/WebUi.tgz WebUi/ --exclude '.*' --exclude '*.pyc' --exclude '*.tgz' --exclude 'attic' --exclude 'xul' --exclude '*.sh' --exclude '*.*~'
\ No newline at end of file
diff --git a/po/deluge.pot b/po/deluge.pot
index 2211be771..8e38333a2 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-10-13 21:34-0500\n"
+"POT-Creation-Date: 2007-10-14 01: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"
@@ -116,7 +116,7 @@ msgstr ""
 msgid "gtk-select-all"
 msgstr ""
 
-#: glade/delugegtk.glade:878 glade/tray_menu.glade:128
+#: glade/delugegtk.glade:878
 msgid "Plu_gins"
 msgstr ""
 
@@ -140,30 +140,30 @@ msgstr ""
 msgid "_Columns"
 msgstr ""
 
-#: glade/delugegtk.glade:947 src/interface.py:597 src/files.py:79
+#: glade/delugegtk.glade:947 src/interface.py:595 src/files.py:79
 msgid "Size"
 msgstr ""
 
-#: glade/delugegtk.glade:956 src/interface.py:601
+#: glade/delugegtk.glade:956 src/interface.py:599
 msgid "Status"
 msgstr ""
 
-#: glade/delugegtk.glade:965 src/interface.py:603
+#: glade/delugegtk.glade:965 src/interface.py:601
 msgid "Seeders"
 msgstr ""
 
-#: glade/delugegtk.glade:974 src/interface.py:606
+#: glade/delugegtk.glade:974 src/interface.py:604
 #: plugins/TorrentPeers/__init__.py:72
 msgid "Peers"
 msgstr ""
 
-#: glade/delugegtk.glade:983 src/interface.py:609 src/interface.py:1107
-#: src/interface.py:1138 plugins/TorrentPeers/tab_peers.py:89
+#: glade/delugegtk.glade:983 src/interface.py:607 src/interface.py:1105
+#: src/interface.py:1136 plugins/TorrentPeers/tab_peers.py:89
 msgid "Down Speed"
 msgstr ""
 
-#: glade/delugegtk.glade:992 src/interface.py:612 src/interface.py:1108
-#: src/interface.py:1139 plugins/TorrentPeers/tab_peers.py:91
+#: glade/delugegtk.glade:992 src/interface.py:610 src/interface.py:1106
+#: src/interface.py:1137 plugins/TorrentPeers/tab_peers.py:91
 msgid "Up Speed"
 msgstr ""
 
@@ -835,14 +835,14 @@ msgid "_Pause All"
 msgstr ""
 
 #: glade/tray_menu.glade:84
-msgid "Global _Down Speed Limit"
+msgid "_Download Speed Limit"
 msgstr ""
 
-#: glade/tray_menu.glade:106
-msgid "Global _Up Speed Limit"
+#: glade/tray_menu.glade:100
+msgid "_Upload Speed Limit"
 msgstr ""
 
-#: glade/tray_menu.glade:161
+#: glade/tray_menu.glade:122
 msgid "_Quit"
 msgstr ""
 
@@ -948,143 +948,143 @@ msgid ""
 "information is sent."
 msgstr ""
 
-#: src/interface.py:263 src/interface.py:269 src/interface.py:350
-#: src/interface.py:376 plugins/SpeedLimiter/__init__.py:82
+#: src/interface.py:261 src/interface.py:267 src/interface.py:348
+#: src/interface.py:374 plugins/SpeedLimiter/__init__.py:82
 #: plugins/SpeedLimiter/__init__.py:92 plugins/SpeedLimiter/__init__.py:136
 #: plugins/SpeedLimiter/__init__.py:168
 msgid "KiB/s"
 msgstr ""
 
-#: src/interface.py:290 src/interface.py:351 src/interface.py:377
-#: src/interface.py:1089 src/interface.py:1096 src/interface.py:1101
-#: src/interface.py:1129 src/interface.py:1131
+#: src/interface.py:288 src/interface.py:349 src/interface.py:375
+#: src/interface.py:1087 src/interface.py:1094 src/interface.py:1099
+#: src/interface.py:1127 src/interface.py:1129
 #: plugins/SpeedLimiter/__init__.py:137 plugins/SpeedLimiter/__init__.py:169
 msgid "Unlimited"
 msgstr ""
 
-#: src/interface.py:293
+#: src/interface.py:291
 msgid "Activated"
 msgstr ""
 
-#: src/interface.py:342 src/interface.py:354 src/interface.py:380
+#: src/interface.py:340 src/interface.py:352 src/interface.py:378
 #: plugins/DesiredRatio/__init__.py:114 plugins/SpeedLimiter/__init__.py:140
 #: plugins/SpeedLimiter/__init__.py:172
 msgid "Other..."
 msgstr ""
 
-#: src/interface.py:359
+#: src/interface.py:357
 msgid "Download Speed (KiB/s):"
 msgstr ""
 
-#: src/interface.py:385
+#: src/interface.py:383
 msgid "Upload Speed (KiB/s):"
 msgstr ""
 
-#: src/interface.py:414
+#: src/interface.py:412
 msgid "Deluge is locked"
 msgstr ""
 
-#: src/interface.py:417
+#: src/interface.py:415
 msgid ""
 "Deluge is password protected.\n"
 "To show the Deluge window, please enter your password"
 msgstr ""
 
-#: src/interface.py:565 src/common.py:73
+#: src/interface.py:563 src/common.py:73
 msgid "Infinity"
 msgstr ""
 
-#: src/interface.py:577
+#: src/interface.py:575
 msgid "Unknown"
 msgstr ""
 
-#: src/interface.py:594 plugins/SimpleRSS/plugin.py:68
+#: src/interface.py:592 plugins/SimpleRSS/plugin.py:68
 #: plugins/SimpleRSS/plugin.py:76 plugins/SimpleRSS/plugin.py:83
 #: plugins/TorrentSearch/plugin.py:51
 msgid "Name"
 msgstr ""
 
-#: src/interface.py:615
+#: src/interface.py:613
 msgid "ETA"
 msgstr ""
 
-#: src/interface.py:618
+#: src/interface.py:616
 msgid "Avail."
 msgstr ""
 
-#: src/interface.py:620
+#: src/interface.py:618
 msgid "Ratio"
 msgstr ""
 
-#: src/interface.py:865
+#: src/interface.py:863
 #, python-format
 msgid "Paused %s"
 msgstr ""
 
-#: src/interface.py:1107
+#: src/interface.py:1105
 msgid "Connections"
 msgstr ""
 
-#: src/interface.py:1125
+#: src/interface.py:1123
 msgid "DHT"
 msgstr ""
 
-#: src/interface.py:1134 plugins/TorrentCreator/__init__.py:148
+#: src/interface.py:1132 plugins/TorrentCreator/__init__.py:148
 msgid "Deluge"
 msgstr ""
 
-#: src/interface.py:1134
+#: src/interface.py:1132
 msgid "Download"
 msgstr ""
 
-#: src/interface.py:1135
+#: src/interface.py:1133
 msgid "Upload"
 msgstr ""
 
-#: src/interface.py:1138
+#: src/interface.py:1136
 msgid "Deluge Bittorrent Client"
 msgstr ""
 
-#: src/interface.py:1215
+#: src/interface.py:1213
 msgid "Choose a download directory"
 msgstr ""
 
-#: src/interface.py:1242
+#: src/interface.py:1240
 msgid ""
 "An error occured while trying to add the torrent. It's possible your ."
 "torrent file is corrupted."
 msgstr ""
 
-#: src/interface.py:1267
+#: src/interface.py:1265
 msgid "Unknown duplicate torrent error."
 msgstr ""
 
-#: src/interface.py:1272
+#: src/interface.py:1270
 msgid ""
 "There is not enough free                disk space to complete your download."
 msgstr ""
 
-#: src/interface.py:1274
+#: src/interface.py:1272
 msgid "Space Needed:"
 msgstr ""
 
-#: src/interface.py:1275
+#: src/interface.py:1273
 msgid "Available Space:"
 msgstr ""
 
-#: src/interface.py:1292
+#: src/interface.py:1290
 msgid "Add torrent from URL"
 msgstr ""
 
-#: src/interface.py:1296
+#: src/interface.py:1294
 msgid "Enter the URL of the .torrent to download"
 msgstr ""
 
-#: src/interface.py:1357
+#: src/interface.py:1355
 msgid "Warning - all downloaded files for this torrent will be deleted!"
 msgstr ""
 
-#: src/interface.py:1368
+#: src/interface.py:1366
 msgid "Are you sure that you want to remove all seeding torrents?"
 msgstr ""
 
@@ -1638,7 +1638,7 @@ msgid "Torrent complete"
 msgstr ""
 
 #: plugins/TorrentNotification/__init__.py:104
-#: plugins/TorrentFiles/__init__.py:70
+#: plugins/TorrentFiles/__init__.py:71
 msgid "Files"
 msgstr ""
 
@@ -1948,11 +1948,11 @@ msgid ""
 "settings for home and work, or for broadband, 3G and dial-up on the fly.\n"
 msgstr ""
 
-#: plugins/TorrentFiles/tab_files.py:63
+#: plugins/TorrentFiles/tab_files.py:59
 msgid "Progress"
 msgstr ""
 
-#: plugins/TorrentFiles/tab_files.py:101
+#: plugins/TorrentFiles/tab_files.py:100
 msgid "There was an error trying to launch the file."
 msgstr ""
 
@@ -2080,23 +2080,23 @@ msgstr ""
 msgid "Open Containing Folder Preferences"
 msgstr ""
 
-#: plugins/Scheduler/plugin.py:75
+#: plugins/Scheduler/plugin.py:76
 msgid "Scheduler Settings"
 msgstr ""
 
-#: plugins/Scheduler/plugin.py:85
+#: plugins/Scheduler/plugin.py:86
 msgid "Limit download to:"
 msgstr ""
 
-#: plugins/Scheduler/plugin.py:86
+#: plugins/Scheduler/plugin.py:87
 msgid "Limit upload to:"
 msgstr ""
 
-#: plugins/Scheduler/plugin.py:134
+#: plugins/Scheduler/plugin.py:135
 msgid "Yellow is limited, red is stopped and green is unlimited."
 msgstr ""
 
-#: plugins/Scheduler/plugin.py:136
+#: plugins/Scheduler/plugin.py:137
 msgid ""
 "When set to -1 (unlimited), the global limits in Deluge's preferences will "
 "be obeyed."
diff --git a/src/plugins.py b/src/plugins.py
index 6ee0dfe38..941394015 100644
--- a/src/plugins.py
+++ b/src/plugins.py
@@ -51,9 +51,7 @@ class PluginManager:
     def scan_for_plugins(self):
         for folder in self.plugin_dirs:
             print "Scanning plugin dir",folder
-            pluginlist = [plugin for plugin in os.listdir(folder) if \
-                os.path.isdir(plugin)]
-            for modname in pluginlist:
+            for modname in os.listdir(folder):
                 path = os.path.join(folder, modname)
                 if '__init__.py' in os.listdir(path):
                     # Import the found module. Note that the last
@@ -131,3 +129,4 @@ if __name__ == "__main__":
         print x
         for y in p.plugins[x]:
             print "\t", y
+