diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index e1a0d4134..62fee51c6 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -24,6 +24,7 @@ deluge/ui/gtkui/glade/dgtkpopups.glade
 deluge/ui/gtkui/glade/tray_menu.glade
 deluge/ui/gtkui/glade/main_window.glade
 deluge/bencode.py
+deluge/docs/source/conf.py
 deluge/core/autoadd.py
 deluge/core/preferencesmanager.py
 deluge/core/filtermanager.py
@@ -41,6 +42,7 @@ deluge/config.py
 deluge/metafile.py
 deluge/pluginmanagerbase.py
 deluge/SimpleXMLRPCServer.py
+deluge/plugins/label/label/webui.py
 deluge/plugins/label/label/test.py
 deluge/plugins/label/label/gtkui/label_config.py
 deluge/plugins/label/label/gtkui/sidebar_menu.py
@@ -72,8 +74,25 @@ deluge/plugins/stats/stats/test_total.py
 deluge/plugins/stats/stats/__init__.py
 deluge/plugins/stats/stats/core.py
 deluge/configmanager.py
+deluge/ui/tracker_icons.py
 deluge/ui/client.py
 deluge/ui/ui.py
+deluge/ui/console/mapping.py
+deluge/ui/console/colors.py
+deluge/ui/console/commands/resume.py
+deluge/ui/console/commands/config.py
+deluge/ui/console/commands/halt.py
+deluge/ui/console/commands/debug.py
+deluge/ui/console/commands/__init__.py
+deluge/ui/console/commands/quit.py
+deluge/ui/console/commands/connect.py
+deluge/ui/console/commands/pause.py
+deluge/ui/console/commands/add.py
+deluge/ui/console/commands/rm.py
+deluge/ui/console/commands/info.py
+deluge/ui/console/commands/help.py
+deluge/ui/console/main.py
+deluge/ui/console/__init__.py
 deluge/ui/gtkui/listview.py
 deluge/ui/gtkui/options_tab.py
 deluge/ui/gtkui/statusbar.py
@@ -107,8 +126,8 @@ deluge/ui/gtkui/new_release_dialog.py
 deluge/ui/gtkui/connectionmanager.py
 deluge/ui/gtkui/createtorrentdialog.py
 deluge/ui/gtkui/details_tab.py
-deluge/ui/gtkui/removetorrentdialog.py
 deluge/ui/signalreceiver.py
+deluge/ui/common.py
 deluge/ui/__init__.py
 deluge/ui/webui/components.py
 deluge/ui/webui/render.py
@@ -171,23 +190,11 @@ deluge/ui/webui/config_tabs_webui.py
 deluge/ui/webui/torrent_options.py
 deluge/ui/webui/torrent_add.py
 deluge/ui/webui/scripts/template_strings.py
+deluge/ui/webui/scripts/extract_ajax_strings.py
+deluge/ui/webui/scripts/copy_icons.py
 deluge/ui/webui/scripts/extract_template_strings.py
-deluge/ui/console/mapping.py
-deluge/ui/console/colors.py
-deluge/ui/console/commands/resume.py
-deluge/ui/console/commands/config.py
-deluge/ui/console/commands/halt.py
-deluge/ui/console/commands/debug.py
-deluge/ui/console/commands/__init__.py
-deluge/ui/console/commands/quit.py
-deluge/ui/console/commands/connect.py
-deluge/ui/console/commands/pause.py
-deluge/ui/console/commands/add.py
-deluge/ui/console/commands/rm.py
-deluge/ui/console/commands/info.py
-deluge/ui/console/commands/help.py
-deluge/ui/console/main.py
-deluge/ui/console/__init__.py
+deluge/ui/null/deluge_shell.py
+deluge/ui/null/__init__.py
 deluge/common.py
 deluge/component.py
 deluge/main.py
@@ -195,6 +202,7 @@ deluge/error.py
 deluge/__init__.py
 deluge/tests/test_signalreceiver.py
 deluge/tests/test_filters.py
+deluge/tests/test_plugin_metadata.py
 deluge/tests/test_tracker_icons.py
 deluge/tests/test_stats.py
 deluge/tests/test_client.py
diff --git a/deluge/i18n/deluge.pot b/deluge/i18n/deluge.pot
index 35e178d2f..5cc05bf9d 100644
--- a/deluge/i18n/deluge.pot
+++ b/deluge/i18n/deluge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-28 00:08-0600\n"
+"POT-Creation-Date: 2008-12-08 21:40-0600\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"
@@ -37,134 +37,137 @@ msgid "<b>Label Options</b>"
 msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:132
+#: deluge/plugins/label/label/data/label_options.glade:195
 #: deluge/plugins/label/build/lib/label/data/label_options.glade:132
-msgid "Connections:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:160
-#: deluge/plugins/label/label/data/label_options.glade:225
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:160
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:225
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:195
 #: deluge/ui/gtkui/glade/main_window.glade:1770
 #: deluge/ui/gtkui/glade/main_window.glade:1782
 #: deluge/ui/gtkui/statusbar.py:332 deluge/ui/gtkui/statusbar.py:342
-#: deluge/ui/gtkui/statusbar.py:359 deluge/ui/gtkui/statusbar.py:387
-#: deluge/ui/gtkui/systemtray.py:209 deluge/ui/gtkui/systemtray.py:215
-#: deluge/ui/gtkui/systemtray.py:333
+#: deluge/ui/gtkui/statusbar.py:347 deluge/ui/gtkui/statusbar.py:359
+#: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/statusbar.py:387
+#: deluge/ui/gtkui/statusbar.py:398 deluge/ui/gtkui/systemtray.py:190
+#: deluge/ui/gtkui/systemtray.py:194 deluge/ui/gtkui/systemtray.py:210
+#: deluge/ui/gtkui/systemtray.py:216 deluge/ui/gtkui/systemtray.py:334
+#: deluge/ui/gtkui/systemtray.py:339
 msgid "KiB/s"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:175
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:175
-msgid "Download Speed:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:187
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:187
-msgid "Upload Speed:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:200
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:200
+#: deluge/plugins/label/label/data/label_options.glade:158
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:158
 msgid "Upload Slots:\t"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:267
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:267
+#: deluge/plugins/label/label/data/label_options.glade:171
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:171
+msgid "Upload Speed:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:184
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:184
+msgid "Download Speed:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:226
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:226
+msgid "Connections:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:270
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:270
 msgid "Apply per torrent max settings:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:280
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:280
+#: deluge/plugins/label/label/data/label_options.glade:283
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:283
 msgid "Maximum"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:348
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:348
-#: deluge/ui/gtkui/glade/main_window.glade:1919
-#: deluge/ui/webui/torrent_options.py:59
-msgid "Remove at ratio"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:363
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:363
-#: deluge/ui/gtkui/glade/main_window.glade:1880
-msgid "Stop seed at ratio:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:378
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:378
+#: deluge/plugins/label/label/data/label_options.glade:336
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:336
 #: deluge/ui/gtkui/glade/main_window.glade:1860
-#: deluge/ui/webui/torrent_options.py:56
+#: deluge/ui/webui/torrent_options.py:48
 #: deluge/ui/webui/scripts/template_strings.py:12
 msgid "Auto Managed"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:407
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:407
+#: deluge/plugins/label/label/data/label_options.glade:349
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:349
+#: deluge/ui/gtkui/glade/main_window.glade:1880
+msgid "Stop seed at ratio:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:364
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:364
+#: deluge/ui/gtkui/glade/main_window.glade:1919
+#: deluge/ui/webui/torrent_options.py:51
+msgid "Remove at ratio"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:410
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:410
 msgid "Apply Queue settings:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:423
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:423
-#: deluge/ui/webui/config_tabs_deluge.py:158
+#: deluge/plugins/label/label/data/label_options.glade:426
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:426
+#: deluge/ui/webui/config_tabs_deluge.py:150
 #: deluge/ui/webui/scripts/template_strings.py:83
 msgid "Queue"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:460
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:460
+#: deluge/plugins/label/label/data/label_options.glade:465
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:465
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:150
 msgid "Move completed to:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:490
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:490
+#: deluge/plugins/label/label/data/label_options.glade:493
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:493
 msgid "Apply location settings:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:506
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:506
+#: deluge/plugins/label/label/data/label_options.glade:509
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:509
 msgid "Location"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:538
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:538
+#: deluge/plugins/label/label/data/label_options.glade:541
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:541
 msgid ""
 "tracker1.org\n"
 "tracker2.com\n"
 "this doesn't do anything yet..\n"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:549
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:549
+#: deluge/plugins/label/label/data/label_options.glade:552
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:552
 msgid "<i>(1 line per tracker)</i>"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:565
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:565
+#: deluge/plugins/label/label/data/label_options.glade:568
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:568
 msgid "Automatically apply label:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:582
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:582
+#: deluge/plugins/label/label/data/label_options.glade:585
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:585
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
-#: deluge/ui/webui/register_menu.py:47
+#: deluge/ui/webui/register_menu.py:39
 msgid "Trackers"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:635
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:635
+#: deluge/plugins/label/label/data/label_options.glade:638
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:638
 msgid "Add Label"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:669
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:669
+#: deluge/plugins/label/label/data/label_options.glade:672
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:672
 msgid "<b>Add Label</b>"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:700
-#: deluge/plugins/label/build/lib/label/data/label_options.glade:700
+#: deluge/plugins/label/label/data/label_options.glade:703
+#: deluge/plugins/label/build/lib/label/data/label_options.glade:703
 msgid "Name:"
 msgstr ""
 
@@ -175,17 +178,20 @@ msgid "Test config value:"
 msgstr ""
 
 #: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:30
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:404
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:366
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:30
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:404
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2976
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:366
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2921
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3097
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3276
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3455
 msgid "Type:"
 msgstr ""
 
 #: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:60
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:392
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:378
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:60
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:392
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:378
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1042
 msgid "URL:"
 msgstr ""
@@ -194,71 +200,70 @@ msgstr ""
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:89
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:738
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2463
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3200
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3744
 #: deluge/ui/gtkui/glade/main_window.glade:2103
 msgid "<b>General</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:125
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:125
-msgid "Days"
-msgstr ""
-
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:151
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:151
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:124
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:124
 msgid "Check for new list every:"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:168
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:168
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:148
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:148
+msgid "Days"
+msgstr ""
+
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:167
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:167
 msgid "Import blocklist on startup"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:186
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:186
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3046
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:185
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:185
 msgid "<b>Settings</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:218
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:218
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:217
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:217
 msgid "Download the blocklist file if necessary and import the file."
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:238
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:238
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:237
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:237
 msgid "Check Download and Import"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:259
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:259
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:258
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:258
 msgid "Download a new blocklist file and import it."
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:279
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:279
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:278
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:278
 msgid "Force Download and Import"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:304
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:304
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:303
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:303
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:424
 msgid "<b>Options</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:416
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:416
-msgid "Date:"
-msgstr ""
-
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:428
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:428
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:344
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:344
 msgid "File Size:"
 msgstr ""
 
-#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:448
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:448
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3677
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:354
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:354
+msgid "Date:"
+msgstr ""
+
+#: deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade:446
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:446
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4224
 msgid "<b>Info</b>"
 msgstr ""
 
@@ -332,7 +337,7 @@ msgid "<b>Download Location</b>"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:473
-#: deluge/ui/webui/config_tabs_deluge.py:89
+#: deluge/ui/webui/config_tabs_deluge.py:81
 msgid "Full"
 msgstr ""
 
@@ -543,7 +548,7 @@ msgid "Compact allocation only allocates space as needed"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:356
-#: deluge/ui/webui/config_tabs_deluge.py:143
+#: deluge/ui/webui/config_tabs_deluge.py:135
 msgid "Use Compact Allocation"
 msgstr ""
 
@@ -633,7 +638,7 @@ msgid "Local Service Discovery finds local peers on your network."
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:900
-#: deluge/ui/webui/config_tabs_deluge.py:81
+#: deluge/ui/webui/config_tabs_deluge.py:73
 msgid "LSD"
 msgstr ""
 
@@ -647,7 +652,7 @@ msgid "NAT Port Mapping Protocol"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:932
-#: deluge/ui/webui/config_tabs_deluge.py:79
+#: deluge/ui/webui/config_tabs_deluge.py:71
 msgid "NAT-PMP"
 msgstr ""
 
@@ -755,7 +760,7 @@ msgid "Maximum Connection Attempts per Second:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1410
-#: deluge/ui/webui/config_tabs_deluge.py:121
+#: deluge/ui/webui/config_tabs_deluge.py:113
 msgid "Ignore limits on local network"
 msgstr ""
 
@@ -804,7 +809,7 @@ msgid ""
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1706
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3234
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3778
 #: deluge/ui/webui/scripts/template_strings.py:43
 msgid "Enable"
 msgstr ""
@@ -842,8 +847,11 @@ msgid "Password protect system tray"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1900
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2950
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3335
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3038
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3214
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3393
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3572
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3879
 msgid "Password:"
 msgstr ""
 
@@ -905,7 +913,7 @@ msgid "<b>Port</b>"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2295
-#: deluge/ui/webui/config_tabs_deluge.py:153
+#: deluge/ui/webui/config_tabs_deluge.py:145
 msgid "Allow Remote Connections"
 msgstr ""
 
@@ -926,7 +934,7 @@ msgid "<i><b><big>Queue</big></b></i>"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2450
-#: deluge/ui/webui/config_tabs_deluge.py:161
+#: deluge/ui/webui/config_tabs_deluge.py:153
 msgid "Queue new torrents to top"
 msgstr ""
 
@@ -982,21 +990,18 @@ msgstr ""
 msgid "<i><b><big>Proxy</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2925
-#: deluge/ui/gtkui/glade/connection_manager.glade:348
-msgid "Port:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2937
-msgid "Host:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2963
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3310
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2908
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3084
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3263
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3442
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3854
 msgid "Username:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2986
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2931
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3107
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3286
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3465
 msgid ""
 "None\n"
 "Socksv4\n"
@@ -1006,86 +1011,117 @@ msgid ""
 "HTTP W/ Auth"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3096
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2985
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3161
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3340
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3519
+#: deluge/ui/gtkui/glade/connection_manager.glade:348
+msgid "Port:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3010
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3186
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3365
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3544
+msgid "Host:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3053
+msgid "<b>Peer</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3229
+msgid "<b>Web Seed</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3408
+msgid "<b>Tracker</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3587
+msgid "<b>DHT</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3640
 msgid "<b><i><big>Notification</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3151
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3695
 msgid "Blinking tray icon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3165
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3709
 msgid "Popup"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3181
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3725
 msgid "Only OGG and WAV files are supported"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3182
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3726
 msgid "Sound:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3260
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3804
 msgid "Address:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3285
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3829
 msgid "Server:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3351
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3895
+#: deluge/ui/webui/config_tabs_deluge.py:93
 #: deluge/ui/webui/scripts/template_strings.py:68
 msgid "None"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3366
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3909
 msgid "SSL"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3381
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3924
 msgid "TLS"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3405
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3948
 msgid "Security:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3420
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3963
 msgid "<b>Email</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3479
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4022
 msgid "<i><b><big>Plugins</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3585
-msgid "Details:"
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4120
+msgid "Author Email:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3598
-msgid "Version:"
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4133
+msgid "Homepage:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3611
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4146
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:263
 msgid "Author:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3622
-msgid "Homepage:"
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4157
+msgid "Version:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3635
-msgid "Author Email:"
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4171
+msgid "Details:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3725
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4274
 msgid "_Install Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3767
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4316
 msgid "_Rescan Plugins"
 msgstr ""
 
@@ -1175,7 +1211,7 @@ msgstr ""
 
 #: deluge/ui/gtkui/glade/connection_manager.glade:245
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:618
-#: deluge/ui/webui/register_menu.py:46
+#: deluge/ui/webui/register_menu.py:38
 #: deluge/ui/webui/scripts/template_strings.py:73
 msgid "Options"
 msgstr ""
@@ -1251,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:574
-#: deluge/ui/webui/torrent_add.py:57
+#: deluge/ui/webui/torrent_add.py:49
 msgid "Set Private Flag"
 msgstr ""
 
@@ -1290,7 +1326,7 @@ msgid "label"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/dgtkpopups.glade:154
-#: deluge/ui/gtkui/glade/main_window.glade:2584
+#: deluge/ui/gtkui/glade/main_window.glade:2583
 msgid "Add Peer"
 msgstr ""
 
@@ -1438,7 +1474,7 @@ msgid "Queue Torrent Up"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:387
-#: deluge/ui/webui/register_menu.py:55
+#: deluge/ui/webui/register_menu.py:47
 msgid "Queue Up"
 msgstr ""
 
@@ -1447,7 +1483,7 @@ msgid "Queue Torrent Down"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:401
-#: deluge/ui/webui/register_menu.py:56
+#: deluge/ui/webui/register_menu.py:48
 msgid "Queue Down"
 msgstr ""
 
@@ -1602,7 +1638,7 @@ msgid "Private"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:2042
-#: deluge/ui/webui/torrent_options.py:53
+#: deluge/ui/webui/torrent_options.py:45
 msgid "Prioritize First/Last"
 msgstr ""
 
@@ -1630,51 +1666,127 @@ msgstr ""
 msgid "New Release"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2421
+#: deluge/ui/gtkui/glade/main_window.glade:2420
 msgid "<b><big>New Release Available!</big></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2472
+#: deluge/ui/gtkui/glade/main_window.glade:2471
 msgid "<i>Available Version:</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2495
+#: deluge/ui/gtkui/glade/main_window.glade:2494
 msgid "<i>Current Version:</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2517
+#: deluge/ui/gtkui/glade/main_window.glade:2516
 msgid "Do not show this dialog in the future"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2557
+#: deluge/ui/gtkui/glade/main_window.glade:2556
 msgid "_Goto Website"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2583
+#: deluge/ui/gtkui/glade/main_window.glade:2582
 msgid "Add a peer by its IP"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:654
+#: deluge/core/torrentmanager.py:665
 msgid "Announce OK"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:675
+#: deluge/core/torrentmanager.py:686
 msgid "Announce Sent"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:684
+#: deluge/core/torrentmanager.py:695
 msgid "Alert"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:695
+#: deluge/core/torrentmanager.py:706
 msgid "Warning"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:705
+#: deluge/core/torrentmanager.py:716
 #: deluge/ui/webui/scripts/template_strings.py:44
 msgid "Error"
 msgstr ""
 
+#: deluge/plugins/label/label/webui.py:71
+msgid "Error setting label options"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:131
+msgid "apply_max"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:132
+msgid "max_download_speed"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:133
+msgid "max_upload_speed"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:134
+msgid "max_upload_slots"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:135
+msgid "max_connections"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:138
+msgid "apply_queue"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:139
+msgid "is_auto_managed"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:140
+msgid "stop_at_ratio"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:141
+msgid "stop_ratio"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:142
+msgid "remove_at_ratio"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:145
+msgid "apply_move_completed"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:146
+msgid "move_completed"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:147
+msgid "move_completed_path"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:150
+msgid "auto_add"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:151
+msgid "auto_add_trackers"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:162
+#: deluge/plugins/label/label/gtkui/submenu.py:40
+#: deluge/plugins/label/label/gtkui/__init__.py:69
+#: deluge/plugins/label/label/gtkui/__init__.py:108
+#: deluge/ui/webui/scripts/template_strings.py:57
+msgid "Label"
+msgstr ""
+
+#: deluge/plugins/label/label/webui.py:163
+msgid "Work in progress.."
+msgstr ""
+
 #: deluge/plugins/label/label/gtkui/sidebar_menu.py:55
 msgid "Label _Options"
 msgstr ""
@@ -1687,13 +1799,6 @@ msgstr ""
 msgid "_Add Label"
 msgstr ""
 
-#: deluge/plugins/label/label/gtkui/submenu.py:41
-#: deluge/plugins/label/label/gtkui/__init__.py:69
-#: deluge/plugins/label/label/gtkui/__init__.py:108
-#: deluge/ui/webui/scripts/template_strings.py:57
-msgid "Label"
-msgstr ""
-
 #: deluge/plugins/label/label/core.py:188
 msgid "Invalid label, valid characters:[a-z0-9_-]"
 msgstr ""
@@ -1737,7 +1842,7 @@ msgid "BlockList"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/webui.py:70
-#: deluge/ui/webui/torrent_add.py:65
+#: deluge/ui/webui/torrent_add.py:57
 msgid "Url"
 msgstr ""
 
@@ -1833,8 +1938,8 @@ msgid "No Incoming Connections!"
 msgstr ""
 
 #: deluge/ui/gtkui/statusbar.py:366 deluge/ui/gtkui/statusbar.py:394
-#: deluge/ui/gtkui/statusbar.py:421 deluge/ui/gtkui/systemtray.py:187
-#: deluge/ui/gtkui/systemtray.py:191 deluge/ui/gtkui/systemtray.py:334
+#: deluge/ui/gtkui/statusbar.py:421 deluge/ui/gtkui/systemtray.py:188
+#: deluge/ui/gtkui/systemtray.py:192 deluge/ui/gtkui/systemtray.py:335
 #: deluge/ui/gtkui/common.py:54 deluge/ui/webui/lib/newforms_plus.py:197
 #: deluge/ui/webui/lib/newforms_plus.py:216
 #: deluge/ui/webui/scripts/template_strings.py:115
@@ -1842,17 +1947,17 @@ msgid "Unlimited"
 msgstr ""
 
 #: deluge/ui/gtkui/statusbar.py:368 deluge/ui/gtkui/statusbar.py:396
-#: deluge/ui/gtkui/statusbar.py:423 deluge/ui/gtkui/systemtray.py:337
+#: deluge/ui/gtkui/statusbar.py:423 deluge/ui/gtkui/systemtray.py:338
 #: deluge/ui/gtkui/common.py:111 deluge/ui/gtkui/common.py:112
 msgid "Other..."
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/systemtray.py:324
+#: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/systemtray.py:325
 #: deluge/ui/gtkui/menubar.py:407
 msgid "Set Maximum Download Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:398 deluge/ui/gtkui/systemtray.py:328
+#: deluge/ui/gtkui/statusbar.py:398 deluge/ui/gtkui/systemtray.py:329
 #: deluge/ui/gtkui/menubar.py:408
 msgid "Set Maximum Upload Speed"
 msgstr ""
@@ -1865,12 +1970,12 @@ msgstr ""
 msgid "Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:91 deluge/ui/gtkui/files_tab.py:105
+#: deluge/ui/gtkui/addtorrentdialog.py:91 deluge/ui/gtkui/files_tab.py:97
 #: deluge/ui/gtkui/createtorrentdialog.py:65
 msgid "Filename"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:102 deluge/ui/gtkui/files_tab.py:125
+#: deluge/ui/gtkui/addtorrentdialog.py:102 deluge/ui/gtkui/files_tab.py:117
 #: deluge/ui/gtkui/torrentview.py:137
 #: deluge/ui/gtkui/createtorrentdialog.py:75
 #: deluge/ui/webui/scripts/template_strings.py:102
@@ -1904,37 +2009,37 @@ msgid ""
 "org/licenses>."
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:196
+#: deluge/ui/gtkui/systemtray.py:197
 msgid "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:196
+#: deluge/ui/gtkui/systemtray.py:197
 #: deluge/ui/webui/scripts/template_strings.py:37
 msgid "Down"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:197
+#: deluge/ui/gtkui/systemtray.py:198
 #: deluge/ui/webui/scripts/template_strings.py:116
 msgid "Up"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:365
+#: deluge/ui/gtkui/systemtray.py:366
 msgid "Deluge is locked"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:368
+#: deluge/ui/gtkui/systemtray.py:369
 msgid ""
 "Deluge is password protected.\n"
 "To show the Deluge window, please enter your password"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:138 deluge/ui/gtkui/peers_tab.py:123
+#: deluge/ui/gtkui/files_tab.py:130 deluge/ui/gtkui/peers_tab.py:115
 #: deluge/ui/gtkui/torrentview.py:141
 #: deluge/ui/webui/scripts/template_strings.py:82
 msgid "Progress"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:151
+#: deluge/ui/gtkui/files_tab.py:143
 msgid "Priority"
 msgstr ""
 
@@ -1963,22 +2068,22 @@ msgstr ""
 msgid "Set Maximum Upload Slots"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:94
+#: deluge/ui/gtkui/peers_tab.py:86
 #: deluge/ui/webui/scripts/template_strings.py:10
 msgid "Address"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:110
+#: deluge/ui/gtkui/peers_tab.py:102
 #: deluge/ui/webui/scripts/template_strings.py:19
 msgid "Client"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:136 deluge/ui/gtkui/torrentview.py:155
+#: deluge/ui/gtkui/peers_tab.py:128 deluge/ui/gtkui/torrentview.py:155
 #: deluge/ui/webui/scripts/template_strings.py:38
 msgid "Down Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:149 deluge/ui/gtkui/torrentview.py:159
+#: deluge/ui/gtkui/peers_tab.py:141 deluge/ui/gtkui/torrentview.py:159
 #: deluge/ui/webui/scripts/template_strings.py:117
 msgid "Up Speed"
 msgstr ""
@@ -2004,15 +2109,15 @@ msgid ""
 "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:78 deluge/ui/gtkui/filtertreeview.py:103
+#: deluge/ui/gtkui/filtertreeview.py:77 deluge/ui/gtkui/filtertreeview.py:99
 msgid "Filters"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:133
+#: deluge/ui/gtkui/filtertreeview.py:134
 msgid "State"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:210
+#: deluge/ui/gtkui/filtertreeview.py:214
 msgid "no label"
 msgstr ""
 
@@ -2032,7 +2137,7 @@ msgstr ""
 msgid "Activated"
 msgstr ""
 
-#: deluge/ui/gtkui/signals.py:142
+#: deluge/ui/gtkui/signals.py:141
 msgid "Torrent is past stop ratio."
 msgstr ""
 
@@ -2047,7 +2152,7 @@ msgstr ""
 msgid "Tracker"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:72 deluge/ui/webui/config_tabs_deluge.py:88
+#: deluge/ui/gtkui/preferences.py:72 deluge/ui/webui/config_tabs_deluge.py:80
 msgid "Enabled"
 msgstr ""
 
@@ -2055,11 +2160,11 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:816
+#: deluge/ui/gtkui/preferences.py:823
 msgid "Select the Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:827
+#: deluge/ui/gtkui/preferences.py:834
 msgid "Plugin Eggs"
 msgstr ""
 
@@ -2073,7 +2178,7 @@ msgstr ""
 msgid "Seeders"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:150 deluge/ui/webui/register_menu.py:48
+#: deluge/ui/gtkui/torrentview.py:150 deluge/ui/webui/register_menu.py:40
 #: deluge/ui/webui/scripts/template_strings.py:79
 msgid "Peers"
 msgstr ""
@@ -2113,309 +2218,309 @@ msgstr ""
 msgid "%.2f%%"
 msgstr ""
 
-#: deluge/ui/webui/render.py:177
+#: deluge/ui/webui/render.py:169
 msgid "∞"
 msgstr ""
 
-#: deluge/ui/webui/config_forms.py:98
+#: deluge/ui/webui/config_forms.py:90
 msgid "These changes were saved"
 msgstr ""
 
-#: deluge/ui/webui/config_forms.py:104
+#: deluge/ui/webui/config_forms.py:96
 msgid "Correct the errors above and try again"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:39
+#: deluge/ui/webui/register_menu.py:31
 #: deluge/ui/webui/scripts/template_strings.py:20
 msgid "Config"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:40
+#: deluge/ui/webui/register_menu.py:32
 #: deluge/ui/webui/scripts/template_strings.py:21
 msgid "Connect"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:41
+#: deluge/ui/webui/register_menu.py:33
 #: deluge/ui/webui/scripts/template_strings.py:5
 msgid "About"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:42
+#: deluge/ui/webui/register_menu.py:34
 #: deluge/ui/webui/scripts/template_strings.py:60
 msgid "Logout"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:44
+#: deluge/ui/webui/register_menu.py:36
 #: deluge/ui/webui/scripts/template_strings.py:105
 msgid "Statistics"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:45 deluge/ui/webui/register_menu.py:59
+#: deluge/ui/webui/register_menu.py:37 deluge/ui/webui/register_menu.py:51
 #: deluge/ui/webui/scripts/template_strings.py:33
 msgid "Details"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:49
+#: deluge/ui/webui/register_menu.py:41
 #: deluge/ui/webui/scripts/template_strings.py:48
 msgid "Files"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:51
+#: deluge/ui/webui/register_menu.py:43
 msgid "Add"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:52
+#: deluge/ui/webui/register_menu.py:44
 msgid "Delete"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:53
+#: deluge/ui/webui/register_menu.py:45
 #: deluge/ui/webui/scripts/template_strings.py:106
 msgid "Stop"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:54
+#: deluge/ui/webui/register_menu.py:46
 #: deluge/ui/webui/scripts/template_strings.py:104
 msgid "Start"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:57
+#: deluge/ui/webui/register_menu.py:49
 msgid "Queue Top"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:58
+#: deluge/ui/webui/register_menu.py:50
 msgid "Queue Bottom"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:60
+#: deluge/ui/webui/register_menu.py:52
 #: deluge/ui/webui/scripts/template_strings.py:61
 msgid "Move"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:61
+#: deluge/ui/webui/register_menu.py:53
 msgid "Reannounce"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:62
+#: deluge/ui/webui/register_menu.py:54
 msgid "Recheck"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:45
+#: deluge/ui/webui/config_tabs_deluge.py:37
 msgid "Ports"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:46
+#: deluge/ui/webui/config_tabs_deluge.py:38
 msgid "From"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:47
+#: deluge/ui/webui/config_tabs_deluge.py:39
 msgid "To"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:48
+#: deluge/ui/webui/config_tabs_deluge.py:40
 msgid "Random"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:76
+#: deluge/ui/webui/config_tabs_deluge.py:68
 msgid "Extra's"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:77
+#: deluge/ui/webui/config_tabs_deluge.py:69
 msgid "Mainline DHT"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:78
+#: deluge/ui/webui/config_tabs_deluge.py:70
 msgid "UpNP"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:80
+#: deluge/ui/webui/config_tabs_deluge.py:72
 msgid "Peer-Exchange"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:86
+#: deluge/ui/webui/config_tabs_deluge.py:78
 msgid "Encryption"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:88
+#: deluge/ui/webui/config_tabs_deluge.py:80
 msgid "Forced"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:88
+#: deluge/ui/webui/config_tabs_deluge.py:80
 msgid "Disabled"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:89
+#: deluge/ui/webui/config_tabs_deluge.py:81
 msgid "Handshake"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:89
+#: deluge/ui/webui/config_tabs_deluge.py:81
 msgid "Either"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:91
+#: deluge/ui/webui/config_tabs_deluge.py:83
 msgid "Inbound"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:92
+#: deluge/ui/webui/config_tabs_deluge.py:84
 msgid "Outbound"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:93
+#: deluge/ui/webui/config_tabs_deluge.py:85
 msgid "Level"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:99
+#: deluge/ui/webui/config_tabs_deluge.py:91
 msgid "Proxy"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv4"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5 W/ Auth"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "HTTP"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:101
+#: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "HTTP W/ Auth"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:103
+#: deluge/ui/webui/config_tabs_deluge.py:95
 msgid "Type"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:104
+#: deluge/ui/webui/config_tabs_deluge.py:96
 msgid "Host"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:105
-#: deluge/ui/webui/config_tabs_deluge.py:152
-#: deluge/ui/webui/config_tabs_webui.py:68
+#: deluge/ui/webui/config_tabs_deluge.py:97
+#: deluge/ui/webui/config_tabs_deluge.py:144
+#: deluge/ui/webui/config_tabs_webui.py:60
 msgid "Port"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:106
+#: deluge/ui/webui/config_tabs_deluge.py:98
 msgid "Username"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:107
-#: deluge/ui/webui/config_tabs_webui.py:90
+#: deluge/ui/webui/config_tabs_deluge.py:99
+#: deluge/ui/webui/config_tabs_webui.py:82
 #: deluge/ui/webui/scripts/template_strings.py:75
 msgid "Password"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:112
+#: deluge/ui/webui/config_tabs_deluge.py:104
 msgid "Global"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:113
-#: deluge/ui/webui/config_tabs_deluge.py:129
+#: deluge/ui/webui/config_tabs_deluge.py:105
+#: deluge/ui/webui/config_tabs_deluge.py:121
 msgid "-1 = Unlimited"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:114
-#: deluge/ui/webui/config_tabs_deluge.py:130
-#: deluge/ui/webui/torrent_options.py:49 deluge/ui/webui/torrent_add.py:51
+#: deluge/ui/webui/config_tabs_deluge.py:106
+#: deluge/ui/webui/config_tabs_deluge.py:122
+#: deluge/ui/webui/torrent_options.py:41 deluge/ui/webui/torrent_add.py:43
 msgid "Maximum Connections"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:115
-#: deluge/ui/webui/config_tabs_deluge.py:131
+#: deluge/ui/webui/config_tabs_deluge.py:107
+#: deluge/ui/webui/config_tabs_deluge.py:123
 msgid "Maximum Download Speed (Kib/s)"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:116
-#: deluge/ui/webui/config_tabs_deluge.py:132
+#: deluge/ui/webui/config_tabs_deluge.py:108
+#: deluge/ui/webui/config_tabs_deluge.py:124
 msgid "Maximum Upload Speed (Kib/s)"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:117
-#: deluge/ui/webui/config_tabs_deluge.py:133
-#: deluge/ui/webui/torrent_options.py:50 deluge/ui/webui/torrent_add.py:52
+#: deluge/ui/webui/config_tabs_deluge.py:109
+#: deluge/ui/webui/config_tabs_deluge.py:125
+#: deluge/ui/webui/torrent_options.py:42 deluge/ui/webui/torrent_add.py:44
 msgid "Maximum Upload Slots"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:119
+#: deluge/ui/webui/config_tabs_deluge.py:111
 msgid "Maximum Half-Open Connections"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:120
+#: deluge/ui/webui/config_tabs_deluge.py:112
 msgid "Maximum Connection Attempts per Second"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:122
+#: deluge/ui/webui/config_tabs_deluge.py:114
 msgid "Rate Limit IP Overhead"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:128
+#: deluge/ui/webui/config_tabs_deluge.py:120
 msgid "Per Torrent"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:138
+#: deluge/ui/webui/config_tabs_deluge.py:130
 #: deluge/ui/webui/scripts/template_strings.py:39
 msgid "Download"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:139
+#: deluge/ui/webui/config_tabs_deluge.py:131
 msgid "Store all downoads in"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:140
+#: deluge/ui/webui/config_tabs_deluge.py:132
 msgid "Save .torrent files to"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:141
+#: deluge/ui/webui/config_tabs_deluge.py:133
 msgid "Auto Add folder"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:142
+#: deluge/ui/webui/config_tabs_deluge.py:134
 msgid "Auto Add enabled"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:144 deluge/ui/webui/torrent_add.py:55
+#: deluge/ui/webui/config_tabs_deluge.py:136 deluge/ui/webui/torrent_add.py:47
 msgid "Prioritize first and last pieces"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:150
+#: deluge/ui/webui/config_tabs_deluge.py:142
 msgid "Daemon"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:151
+#: deluge/ui/webui/config_tabs_deluge.py:143
 msgid "Restart daemon and webui after changing these settings"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:159
+#: deluge/ui/webui/config_tabs_deluge.py:151
 msgid "-1 = unlimited"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:165
+#: deluge/ui/webui/config_tabs_deluge.py:157
 msgid "Total active torrents"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:166
+#: deluge/ui/webui/config_tabs_deluge.py:158
 msgid "Total active downloading"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:167
+#: deluge/ui/webui/config_tabs_deluge.py:159
 msgid "Total active seeding"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:174
+#: deluge/ui/webui/config_tabs_deluge.py:166
 msgid "Stop seeding when ratio reaches"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:176
+#: deluge/ui/webui/config_tabs_deluge.py:168
 msgid "Remove torrent when ratio reached"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:196
+#: deluge/ui/webui/config_tabs_deluge.py:188
 msgid "Enabled Plugins"
 msgstr ""
 
@@ -2564,150 +2669,150 @@ msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: deluge/ui/webui/pages.py:273
+#: deluge/ui/webui/pages.py:265
 msgid "refresh must be > 0"
 msgstr ""
 
-#: deluge/ui/webui/pages.py:324
+#: deluge/ui/webui/pages.py:316
 msgid "no uri"
 msgstr ""
 
-#: deluge/ui/webui/torrent_move.py:45
+#: deluge/ui/webui/torrent_move.py:37
 msgid "Move To"
 msgstr ""
 
-#: deluge/ui/webui/torrent_move.py:72
+#: deluge/ui/webui/torrent_move.py:64
 msgid "Error in Path."
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:49
-#: deluge/ui/webui/config_tabs_webui.py:55
+#: deluge/ui/webui/config_tabs_webui.py:41
+#: deluge/ui/webui/config_tabs_webui.py:47
 msgid "Template"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:52
+#: deluge/ui/webui/config_tabs_webui.py:44
 msgid "Text and image"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:52
+#: deluge/ui/webui/config_tabs_webui.py:44
 msgid "Image Only"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:53
+#: deluge/ui/webui/config_tabs_webui.py:45
 msgid "Text Only"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:56
+#: deluge/ui/webui/config_tabs_webui.py:48
 msgid "Button style"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:57
+#: deluge/ui/webui/config_tabs_webui.py:49
 msgid "Auto refresh (seconds)"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:58
+#: deluge/ui/webui/config_tabs_webui.py:50
 msgid "Cache templates"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:65
+#: deluge/ui/webui/config_tabs_webui.py:57
 msgid "Server"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:66
+#: deluge/ui/webui/config_tabs_webui.py:58
 msgid "Manually restart webui to apply changes."
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:69
+#: deluge/ui/webui/config_tabs_webui.py:61
 msgid "Https"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:78
+#: deluge/ui/webui/config_tabs_webui.py:70
 #, python-format
 msgid "Certificate not found at '%s'"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:81
+#: deluge/ui/webui/config_tabs_webui.py:73
 #, python-format
 msgid "Key not found at '%s'"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:92
+#: deluge/ui/webui/config_tabs_webui.py:84
 msgid "Current Password"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:93
+#: deluge/ui/webui/config_tabs_webui.py:85
 msgid "New Password"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:94
+#: deluge/ui/webui/config_tabs_webui.py:86
 msgid "New Password (Confirm)"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:101
+#: deluge/ui/webui/config_tabs_webui.py:93
 msgid "Old password is invalid"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:104
+#: deluge/ui/webui/config_tabs_webui.py:96
 msgid "New Password is not equal to New Password(confirm)"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:111
+#: deluge/ui/webui/config_tabs_webui.py:103
 msgid "Sidebar"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:112
+#: deluge/ui/webui/config_tabs_webui.py:104
 msgid "Show sidebar"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:113
+#: deluge/ui/webui/config_tabs_webui.py:105
 msgid "Show zero hits"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:114
+#: deluge/ui/webui/config_tabs_webui.py:106
 msgid "Show trackers"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:115
+#: deluge/ui/webui/config_tabs_webui.py:107
 msgid "Show keyword search"
 msgstr ""
 
-#: deluge/ui/webui/torrent_options.py:46 deluge/ui/webui/torrent_add.py:48
+#: deluge/ui/webui/torrent_options.py:38 deluge/ui/webui/torrent_add.py:40
 msgid "Maximum Down Speed"
 msgstr ""
 
-#: deluge/ui/webui/torrent_options.py:48 deluge/ui/webui/torrent_add.py:50
+#: deluge/ui/webui/torrent_options.py:40 deluge/ui/webui/torrent_add.py:42
 msgid "Maximum Up Speed"
 msgstr ""
 
-#: deluge/ui/webui/torrent_options.py:57
+#: deluge/ui/webui/torrent_options.py:49
 msgid "Stop seed at ratio"
 msgstr ""
 
-#: deluge/ui/webui/torrent_options.py:71 deluge/ui/webui/torrent_add.py:104
+#: deluge/ui/webui/torrent_options.py:63 deluge/ui/webui/torrent_add.py:96
 msgid "Error in torrent options."
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:43
+#: deluge/ui/webui/torrent_add.py:35
 msgid "Download Location"
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:44
+#: deluge/ui/webui/torrent_add.py:36
 msgid "Compact Allocation"
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:56
+#: deluge/ui/webui/torrent_add.py:48
 msgid "Add In Paused State"
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:67
+#: deluge/ui/webui/torrent_add.py:59
 msgid "Upload torrent"
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:118
+#: deluge/ui/webui/torrent_add.py:110
 msgid "Choose an url or a torrent, not both."
 msgstr ""
 
-#: deluge/ui/webui/torrent_add.py:130
+#: deluge/ui/webui/torrent_add.py:122
 msgid "No data"
 msgstr ""