diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index ae2d17864..e80af2737 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -1,150 +1,152 @@
-deluge/scripts/wiki_docgen.py
-deluge/scripts/state_upgrade.py
-deluge/core/daemon.py
-deluge/core/signalmanager.py
-deluge/core/torrent.py
-deluge/core/core.py
-deluge/core/__init__.py
-deluge/core/torrentmanager.py
-deluge/core/pluginmanager.py
 deluge/core/autoadd.py
+deluge/core/signalmanager.py
+deluge/core/torrentmanager.py
+deluge/core/daemon.py
+deluge/core/torrent.py
+deluge/core/pluginmanager.py
+deluge/core/oldstateupgrader.py
+deluge/core/__init__.py
+deluge/core/core.py
 deluge/core/alertmanager.py
-deluge/main.py
-deluge/xmlrpclib.py
-deluge/SimpleXMLRPCServer.py
-deluge/component.py
-deluge/pluginmanagerbase.py
-deluge/error.py
-deluge/configmanager.py
-deluge/log.py
 deluge/config.py
-deluge/__init__.py
-deluge/ui/ui.py
-deluge/ui/webui/scripts/extract_template_strings.py
-deluge/ui/webui/scripts/template_strings.py
-deluge/ui/webui/tests/multicall_notepad.py
-deluge/ui/webui/tests/test_all.py
-deluge/ui/webui/json_api.py
-deluge/ui/webui/pages.py
-deluge/ui/webui/torrent_add.py
-deluge/ui/webui/config_tabs_deluge.py
-deluge/ui/webui/webserver_common.py
-deluge/ui/webui/config_tabs_webui.py
-deluge/ui/webui/torrent_move.py
-deluge/ui/webui/config_forms.py
-deluge/ui/webui/webui.py
-deluge/ui/webui/page_decorators.py
-deluge/ui/webui/components.py
-deluge/ui/webui/deluge_webserver.py
-deluge/ui/webui/utils.py
-deluge/ui/webui/apache.py
-deluge/ui/webui/debugerror.py
-deluge/ui/webui/torrent_options.py
-deluge/ui/webui/lib/newforms_portable/widgets.py
-deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py
-deluge/ui/webui/lib/newforms_portable/django/core/__init__.py
-deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py
-deluge/ui/webui/lib/newforms_portable/django/utils/translation.py
-deluge/ui/webui/lib/newforms_portable/django/utils/functional.py
-deluge/ui/webui/lib/newforms_portable/django/utils/html.py
-deluge/ui/webui/lib/newforms_portable/django/utils/encoding.py
-deluge/ui/webui/lib/newforms_portable/django/utils/http.py
-deluge/ui/webui/lib/newforms_portable/django/utils/__init__.py
-deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py
-deluge/ui/webui/lib/newforms_portable/django/__init__.py
-deluge/ui/webui/lib/newforms_portable/util.py
-deluge/ui/webui/lib/newforms_portable/forms.py
-deluge/ui/webui/lib/newforms_portable/models.py
-deluge/ui/webui/lib/newforms_portable/fields.py
-deluge/ui/webui/lib/newforms_portable/__init__.py
-deluge/ui/webui/lib/webpy022/request.py
-deluge/ui/webui/lib/webpy022/webapi.py
-deluge/ui/webui/lib/webpy022/wsgi.py
-deluge/ui/webui/lib/webpy022/utils.py
-deluge/ui/webui/lib/webpy022/debugerror.py
-deluge/ui/webui/lib/webpy022/cheetah.py
-deluge/ui/webui/lib/webpy022/net.py
-deluge/ui/webui/lib/webpy022/http.py
-deluge/ui/webui/lib/webpy022/__init__.py
-deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py
-deluge/ui/webui/lib/webpy022/template.py
-deluge/ui/webui/lib/webpy022/httpserver.py
-deluge/ui/webui/lib/webpy022/form.py
-deluge/ui/webui/lib/webpy022/db.py
-deluge/ui/webui/lib/web.py
-deluge/ui/webui/lib/__init__.py
-deluge/ui/webui/lib/json.py
-deluge/ui/webui/lib/static_handler.py
-deluge/ui/webui/lib/pythonize.py
-deluge/ui/webui/lib/newforms_plus.py
-deluge/ui/webui/render.py
-deluge/ui/webui/web.py
-deluge/ui/webui/__init__.py
-deluge/ui/webui/register_menu.py
-deluge/ui/null/deluge_shell.py
-deluge/ui/null/__init__.py
-deluge/ui/signalreceiver.py
-deluge/ui/client.py
-deluge/ui/__init__.py
-deluge/ui/gtkui/connectionmanager.py
-deluge/ui/gtkui/ipcinterface.py
-deluge/ui/gtkui/options_tab.py
-deluge/ui/gtkui/preferences.py
-deluge/ui/gtkui/addtorrentdialog.py
-deluge/ui/gtkui/torrentdetails.py
-deluge/ui/gtkui/peers_tab.py
-deluge/ui/gtkui/mainwindow.py
-deluge/ui/gtkui/coreconfig.py
-deluge/ui/gtkui/menubar.py
-deluge/ui/gtkui/statistics_tab.py
-deluge/ui/gtkui/gtkui.py
-deluge/ui/gtkui/sidebar.py
-deluge/ui/gtkui/systemtray.py
-deluge/ui/gtkui/toolbar.py
-deluge/ui/gtkui/torrentview.py
-deluge/ui/gtkui/files_tab.py
-deluge/ui/gtkui/signals.py
-deluge/ui/gtkui/queuedtorrents.py
-deluge/ui/gtkui/__init__.py
-deluge/ui/gtkui/removetorrentdialog.py
-deluge/ui/gtkui/details_tab.py
-deluge/ui/gtkui/pluginmanager.py
-deluge/ui/gtkui/dbusinterface.py
-deluge/ui/gtkui/listview.py
-deluge/ui/gtkui/aboutdialog.py
-deluge/ui/gtkui/statusbar.py
-deluge/ui/gtkui/edittrackersdialog.py
-deluge/common.py
-deluge/plugins/init.py
-deluge/plugins/label/label/ui.py
-deluge/plugins/label/label/gtk_sidebar.py
-deluge/plugins/label/label/test.py
-deluge/plugins/label/label/webui.py
+deluge/pluginmanagerbase.py
+deluge/SimpleXMLRPCServer.py
 deluge/plugins/label/label/webui_config.py
+deluge/plugins/label/label/webui.py
+deluge/plugins/label/label/gtk_sidebar.py
 deluge/plugins/label/label/gtkui.py
+deluge/plugins/label/label/test.py
+deluge/plugins/label/label/ui.py
 deluge/plugins/label/label/webui_pages.py
-deluge/plugins/label/label/core.py
 deluge/plugins/label/label/__init__.py
+deluge/plugins/label/label/core.py
 deluge/plugins/label/setup.py
-deluge/plugins/__init__.py
 deluge/plugins/corepluginbase.py
+deluge/plugins/init.py
 deluge/plugins/blocklist/setup.py
-deluge/plugins/blocklist/blocklist/ui.py
-deluge/plugins/blocklist/blocklist/peerguardian.py
 deluge/plugins/blocklist/blocklist/webui.py
 deluge/plugins/blocklist/blocklist/gtkui.py
-deluge/plugins/blocklist/blocklist/core.py
+deluge/plugins/blocklist/blocklist/ui.py
 deluge/plugins/blocklist/blocklist/text.py
+deluge/plugins/blocklist/blocklist/peerguardian.py
 deluge/plugins/blocklist/blocklist/__init__.py
-deluge/ui/gtkui/glade/connection_manager.glade
-deluge/ui/gtkui/glade/preferences_dialog.glade
-deluge/ui/gtkui/glade/queuedtorrents.glade
-deluge/ui/gtkui/glade/dgtkpopups.glade
-deluge/ui/gtkui/glade/remove_torrent_dialog.glade
-deluge/ui/gtkui/glade/edit_trackers.glade
-deluge/ui/gtkui/glade/move_storage_dialog.glade
+deluge/plugins/blocklist/blocklist/core.py
+deluge/plugins/__init__.py
+deluge/configmanager.py
+deluge/ui/client.py
+deluge/ui/ui.py
+deluge/ui/gtkui/listview.py
+deluge/ui/gtkui/options_tab.py
+deluge/ui/gtkui/statusbar.py
+deluge/ui/gtkui/statistics_tab.py
+deluge/ui/gtkui/addtorrentdialog.py
+deluge/ui/gtkui/coreconfig.py
+deluge/ui/gtkui/sidebar.py
+deluge/ui/gtkui/gtkui.py
+deluge/ui/gtkui/aboutdialog.py
+deluge/ui/gtkui/systemtray.py
+deluge/ui/gtkui/dbusinterface.py
+deluge/ui/gtkui/files_tab.py
+deluge/ui/gtkui/menubar.py
+deluge/ui/gtkui/peers_tab.py
+deluge/ui/gtkui/toolbar.py
+deluge/ui/gtkui/ipcinterface.py
+deluge/ui/gtkui/queuedtorrents.py
+deluge/ui/gtkui/pluginmanager.py
+deluge/ui/gtkui/mainwindow.py
+deluge/ui/gtkui/removetorrentdialog.py
+deluge/ui/gtkui/signals.py
+deluge/ui/gtkui/torrentdetails.py
+deluge/ui/gtkui/__init__.py
+deluge/ui/gtkui/edittrackersdialog.py
+deluge/ui/gtkui/preferences.py
+deluge/ui/gtkui/torrentview.py
+deluge/ui/gtkui/new_release_dialog.py
+deluge/ui/gtkui/connectionmanager.py
+deluge/ui/gtkui/details_tab.py
+deluge/ui/signalreceiver.py
+deluge/ui/__init__.py
+deluge/ui/webui/components.py
+deluge/ui/webui/render.py
+deluge/ui/webui/page_decorators.py
+deluge/ui/webui/webui.py
+deluge/ui/webui/debugerror.py
+deluge/ui/webui/webserver_common.py
+deluge/ui/webui/config_forms.py
+deluge/ui/webui/deluge_webserver.py
+deluge/ui/webui/json_api.py
+deluge/ui/webui/register_menu.py
+deluge/ui/webui/config_tabs_deluge.py
+deluge/ui/webui/lib/webpy022/request.py
+deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py
+deluge/ui/webui/lib/webpy022/db.py
+deluge/ui/webui/lib/webpy022/template.py
+deluge/ui/webui/lib/webpy022/cheetah.py
+deluge/ui/webui/lib/webpy022/debugerror.py
+deluge/ui/webui/lib/webpy022/http.py
+deluge/ui/webui/lib/webpy022/httpserver.py
+deluge/ui/webui/lib/webpy022/utils.py
+deluge/ui/webui/lib/webpy022/__init__.py
+deluge/ui/webui/lib/webpy022/net.py
+deluge/ui/webui/lib/webpy022/wsgi.py
+deluge/ui/webui/lib/webpy022/webapi.py
+deluge/ui/webui/lib/webpy022/form.py
+deluge/ui/webui/lib/json.py
+deluge/ui/webui/lib/newforms_plus.py
+deluge/ui/webui/lib/pythonize.py
+deluge/ui/webui/lib/static_handler.py
+deluge/ui/webui/lib/__init__.py
+deluge/ui/webui/lib/web.py
+deluge/ui/webui/lib/newforms_portable/django/core/__init__.py
+deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py
+deluge/ui/webui/lib/newforms_portable/django/utils/html.py
+deluge/ui/webui/lib/newforms_portable/django/utils/http.py
+deluge/ui/webui/lib/newforms_portable/django/utils/encoding.py
+deluge/ui/webui/lib/newforms_portable/django/utils/translation.py
+deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py
+deluge/ui/webui/lib/newforms_portable/django/utils/__init__.py
+deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py
+deluge/ui/webui/lib/newforms_portable/django/utils/functional.py
+deluge/ui/webui/lib/newforms_portable/django/__init__.py
+deluge/ui/webui/lib/newforms_portable/forms.py
+deluge/ui/webui/lib/newforms_portable/models.py
+deluge/ui/webui/lib/newforms_portable/widgets.py
+deluge/ui/webui/lib/newforms_portable/fields.py
+deluge/ui/webui/lib/newforms_portable/__init__.py
+deluge/ui/webui/lib/newforms_portable/util.py
+deluge/ui/webui/utils.py
+deluge/ui/webui/pages.py
+deluge/ui/webui/__init__.py
+deluge/ui/webui/tests/multicall_notepad.py
+deluge/ui/webui/tests/test_all.py
+deluge/ui/webui/apache.py
+deluge/ui/webui/web.py
+deluge/ui/webui/torrent_move.py
+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_template_strings.py
+deluge/ui/null/deluge_shell.py
+deluge/ui/null/__init__.py
+deluge/common.py
+deluge/component.py
+deluge/main.py
+deluge/error.py
+deluge/__init__.py
+deluge/log.py
+deluge/xmlrpclib.py
+deluge/scripts/wiki_docgen.py
+deluge/scripts/state_upgrade.py
+deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
 deluge/ui/gtkui/glade/add_torrent_dialog.glade
 deluge/ui/gtkui/glade/torrent_menu.glade
+deluge/ui/gtkui/glade/remove_torrent_dialog.glade
+deluge/ui/gtkui/glade/preferences_dialog.glade
+deluge/ui/gtkui/glade/edit_trackers.glade
+deluge/ui/gtkui/glade/queuedtorrents.glade
+deluge/ui/gtkui/glade/move_storage_dialog.glade
+deluge/ui/gtkui/glade/connection_manager.glade
+deluge/ui/gtkui/glade/dgtkpopups.glade
 deluge/ui/gtkui/glade/tray_menu.glade
 deluge/ui/gtkui/glade/main_window.glade
-deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
diff --git a/deluge/i18n/deluge.pot b/deluge/i18n/deluge.pot
index 10017062c..8fe72dc27 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-10-18 19:10-0500\n"
+"POT-Creation-Date: 2008-10-27 18:16-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,432 +16,594 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: deluge/core/torrentmanager.py:667
+#: deluge/core/torrentmanager.py:670
 msgid "Announce OK"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:688
+#: deluge/core/torrentmanager.py:691
 msgid "Announce Sent"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:697
+#: deluge/core/torrentmanager.py:700
 msgid "Alert"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:708
+#: deluge/core/torrentmanager.py:711
 msgid "Warning"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:718
+#: deluge/core/torrentmanager.py:721 deluge/ui/gtkui/sidebar.py:69
 #: deluge/ui/webui/scripts/template_strings.py:25
-#: deluge/ui/gtkui/sidebar.py:69
 msgid "Error"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:1
-msgid "# Of Files"
+#: deluge/plugins/label/label/webui_config.py:46
+#: deluge/plugins/label/label/gtkui.py:323 deluge/ui/gtkui/sidebar.py:76
+msgid "Labels"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:2
-#: deluge/ui/webui/register_menu.py:41
-msgid "About"
+#: deluge/plugins/label/label/webui_config.py:58
+msgid "Select Label"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:3
-#: deluge/ui/webui/register_menu.py:51 deluge/plugins/label/label/gtkui.py:348
-msgid "Add"
+#: deluge/plugins/label/label/webui_config.py:83
+#: deluge/ui/webui/config_tabs_deluge.py:102
+#: deluge/ui/webui/config_tabs_deluge.py:117
+#: deluge/ui/webui/torrent_options.py:19 deluge/ui/webui/torrent_add.py:51
+msgid "Maximum Connections"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:4
-msgid "Add Another (Stay in add page)"
+#: deluge/plugins/label/label/webui_config.py:84
+#: deluge/ui/webui/config_tabs_deluge.py:103
+#: deluge/ui/webui/config_tabs_deluge.py:118
+msgid "Maximum Download Speed (Kib/s)"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:5
-msgid "Add Torrent"
+#: deluge/plugins/label/label/webui_config.py:85
+#: deluge/ui/webui/config_tabs_deluge.py:104
+#: deluge/ui/webui/config_tabs_deluge.py:119
+msgid "Maximum Upload Speed (Kib/s)"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:6
-#: deluge/ui/gtkui/glade/main_window.glade:267
-msgid "Add torrent"
+#: deluge/plugins/label/label/webui_config.py:86
+#: deluge/ui/webui/config_tabs_deluge.py:105
+#: deluge/ui/webui/config_tabs_deluge.py:120
+#: deluge/ui/webui/torrent_options.py:20 deluge/ui/webui/torrent_add.py:52
+msgid "Maximum Upload Slots"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:7
-msgid "Auto refresh:"
+#: deluge/plugins/label/label/webui_config.py:88
+msgid "Apply"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:8
-msgid "Ava"
+#: deluge/plugins/label/label/webui_config.py:89
+#: deluge/ui/webui/register_menu.py:52
+msgid "Delete"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:9
-msgid "Availability"
+#: deluge/plugins/label/label/webui_config.py:99
+msgid "Add Label"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:10
-msgid "BandWidth"
+#: deluge/plugins/label/label/webui_config.py:108
+#: deluge/plugins/label/label/gtkui.py:104
+#: deluge/plugins/label/label/gtkui.py:272
+#: deluge/plugins/label/label/webui_pages.py:62
+msgid "Label"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:11
-#: deluge/ui/webui/register_menu.py:39
-msgid "Config"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:12
-#: deluge/ui/gtkui/statusbar.py:149
-msgid "Connections"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:13
-msgid "DHT Nodes"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:14
-msgid "Debug:Data Dump"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:15
-msgid "Delete .torrent file"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:16
-msgid "Delete downloaded files."
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:17
-#: deluge/ui/webui/register_menu.py:45 deluge/ui/webui/register_menu.py:59
-msgid "Details"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:18
-msgid "Disable"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:19
-#: deluge/ui/gtkui/systemtray.py:196
-msgid "Down"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:20
-#: deluge/ui/gtkui/peers_tab.py:120 deluge/ui/gtkui/torrentview.py:147
-msgid "Down Speed"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:21
-#: deluge/ui/webui/config_tabs_deluge.py:125 deluge/ui/gtkui/systemtray.py:312
-msgid "Download"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:22
-msgid "Downloaded"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:23
-#: deluge/ui/gtkui/torrentview.py:155
-msgid "ETA"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:24
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1783
-msgid "Enable"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:26
-msgid "Eta"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:27
-msgid "File"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:28
-msgid "Filter on Tracker"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:29
-msgid "Filter on state"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:30
 #: deluge/plugins/label/label/webui_config.py:115
 #: deluge/plugins/label/label/gtkui.py:301
+#: deluge/ui/webui/scripts/template_strings.py:30
 msgid "General"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:31
-msgid "Hash"
+#: deluge/plugins/label/label/webui_config.py:124
+msgid "Hide filter items with 0 hits"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:32
-msgid "Login"
+#: deluge/plugins/label/label/gtk_sidebar.py:72
+msgid "Filters"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:33
-#: deluge/ui/webui/register_menu.py:42
-msgid "Logout"
+#: deluge/plugins/label/label/gtkui.py:109
+#: deluge/ui/gtkui/edittrackersdialog.py:83
+#: deluge/ui/webui/scripts/template_strings.py:68
+msgid "Tracker"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:34
-#: deluge/ui/gtkui/torrentview.py:127
-msgid "Name"
+#: deluge/plugins/label/label/gtkui.py:319
+msgid "Hide Zero Hits"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:35
-msgid "Next Announce"
+#: deluge/plugins/label/label/gtkui.py:348 deluge/ui/webui/register_menu.py:51
+#: deluge/ui/webui/scripts/template_strings.py:3
+msgid "Add"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:265
+msgid "Invalid label, valid characters:[a-z0-9_-]"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:266
+msgid "Empty Label"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:267
+#: deluge/plugins/label/label/core.py:281
+#: deluge/plugins/label/label/core.py:299
+#: deluge/plugins/label/label/core.py:331
+msgid "Unknown Label"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:332
+msgid "Unknown Torrent"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:46
+msgid "Emule IP list (GZip)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:47
+msgid "SafePeer Text (Zipped)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:48
+msgid "PeerGuardian Text (Uncompressed)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:49
+msgid "PeerGuardian P2B (GZip)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:58
+msgid "BlockList"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:78
+#: deluge/ui/webui/torrent_add.py:65
+#: deluge/ui/webui/scripts/template_strings.py:75
+msgid "Url"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:79
+msgid "Check for every (days)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:80
+msgid "Timeout (seconds)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:81
+msgid "Times to attempt download"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:82
+msgid "Import on daemon startup"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:84
+msgid "Download Now"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:85
+msgid "Import Now"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:92
+#, python-format
+msgid "Downloading %.2f%%"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:94
+#, python-format
+msgid "Importing %s"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:96
+#, python-format
+msgid "Blocked Ranges: %s"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:98
+msgid "Inactive"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:105
+msgid "Refresh status"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/peerguardian.py:31
+msgid "Invalid leader"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/peerguardian.py:35
+msgid "Invalid magic code"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/peerguardian.py:40
+msgid "Invalid version"
+msgstr ""
+
+#: deluge/ui/gtkui/listview.py:84
+#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
+msgid "Unknown"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:134
+msgid "Not Connected"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:149
+#: deluge/ui/webui/scripts/template_strings.py:12
+msgid "Connections"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:154
+msgid "Download Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:159
+msgid "Upload Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:167
+msgid "No Incoming Connections!"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:329 deluge/ui/gtkui/statusbar.py:339
+#: deluge/ui/gtkui/statusbar.py:352 deluge/ui/gtkui/statusbar.py:380
+#: deluge/ui/gtkui/systemtray.py:209 deluge/ui/gtkui/systemtray.py:215
+#: deluge/ui/gtkui/systemtray.py:321
+#: deluge/ui/gtkui/glade/main_window.glade:1665
+#: deluge/ui/gtkui/glade/main_window.glade:1679
+msgid "KiB/s"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:359 deluge/ui/gtkui/statusbar.py:387
+#: deluge/ui/gtkui/statusbar.py:414 deluge/ui/gtkui/systemtray.py:187
+#: deluge/ui/gtkui/systemtray.py:191 deluge/ui/gtkui/systemtray.py:322
+#: deluge/ui/webui/lib/newforms_plus.py:193
+#: deluge/ui/webui/lib/newforms_plus.py:204 deluge/common.py:181
+msgid "Unlimited"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:361 deluge/ui/gtkui/statusbar.py:389
+#: deluge/ui/gtkui/statusbar.py:416 deluge/ui/gtkui/systemtray.py:325
+#: deluge/common.py:238 deluge/common.py:239
+msgid "Other..."
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:363
+msgid "Download Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:391
+msgid "Upload Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/statusbar.py:418
+msgid "Connection Limit:"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:90 deluge/ui/gtkui/queuedtorrents.py:71
+msgid "Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:98 deluge/ui/gtkui/files_tab.py:109
+msgid "Filename"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:109 deluge/ui/gtkui/files_tab.py:125
+#: deluge/ui/gtkui/torrentview.py:129
+#: deluge/ui/webui/scripts/template_strings.py:62
+msgid "Size"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:452
+msgid "Choose a .torrent file"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:464
+msgid "Torrent files"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:468
+msgid "All files"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:56
+msgid "All"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:57
+msgid "Downloading"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:60
+msgid "Seeding"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:63
+msgid "Queued"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:66
+msgid "Paused"
+msgstr ""
+
+#: deluge/ui/gtkui/sidebar.py:72
+msgid "Checking"
+msgstr ""
+
+#: deluge/ui/gtkui/aboutdialog.py:66
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 3 of the License, or (at your option) "
+"any later version. This program is distributed in the hope that it will be "
+"useful, but WITHOUT ANY WARRANTY; without even the implied warranty of "
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+"Public License for more details. You should have received a copy of the GNU "
+"General Public License along with this program; if not, see <http://www.gnu."
+"org/licenses>."
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:196
+msgid "Deluge"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:196
+#: deluge/ui/webui/scripts/template_strings.py:19
+msgid "Down"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:197
+#: deluge/ui/webui/scripts/template_strings.py:70
+msgid "Up"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:312 deluge/ui/webui/config_tabs_deluge.py:125
+#: deluge/ui/webui/scripts/template_strings.py:21
+msgid "Download"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:316
+#: deluge/ui/webui/scripts/template_strings.py:72
+msgid "Upload"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:356
+msgid "Deluge is locked"
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:359
+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/torrentview.py:133
+#: deluge/ui/webui/scripts/template_strings.py:44
+msgid "Progress"
+msgstr ""
+
+#: deluge/ui/gtkui/files_tab.py:151
+msgid "Priority"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:77
+msgid "Set Unlimited"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:81
+msgid "Other.."
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:89
+msgid "On"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:36
 #: deluge/ui/gtkui/menubar.py:92
+#: deluge/ui/webui/scripts/template_strings.py:36
 msgid "Off"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:37
+#: deluge/ui/gtkui/menubar.py:328
+msgid "Choose a directory to move files to"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:437
+msgid "Set Max Download Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:439
+msgid "Set Max Upload Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:441
+msgid "Set Max Connections:"
+msgstr ""
+
+#: deluge/ui/gtkui/menubar.py:443
+msgid "Set Max Upload Slots:"
+msgstr ""
+
+#: deluge/ui/gtkui/peers_tab.py:91
+msgid "Address"
+msgstr ""
+
+#: deluge/ui/gtkui/peers_tab.py:107
+msgid "Client"
+msgstr ""
+
+#: deluge/ui/gtkui/peers_tab.py:120 deluge/ui/gtkui/torrentview.py:147
+#: deluge/ui/webui/scripts/template_strings.py:20
+msgid "Down Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/peers_tab.py:133 deluge/ui/gtkui/torrentview.py:151
+#: deluge/ui/webui/scripts/template_strings.py:71
+msgid "Up Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/queuedtorrents.py:131
+msgid " Torrents Queued"
+msgstr ""
+
+#: deluge/ui/gtkui/queuedtorrents.py:133
+msgid " Torrent Queued"
+msgstr ""
+
+#: deluge/ui/gtkui/removetorrentdialog.py:65
+msgid ""
+"<big><b>Are you sure you want to remove the selected torrents?</b></big>"
+msgstr ""
+
+#: deluge/ui/gtkui/removetorrentdialog.py:66
+msgid "Remove Selected Torrents"
+msgstr ""
+
+#: deluge/ui/gtkui/signals.py:142
+msgid "Torrent is past stop ratio."
+msgstr ""
+
+#: deluge/ui/gtkui/edittrackersdialog.py:81
+msgid "Tier"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:79 deluge/ui/webui/config_tabs_deluge.py:88
+msgid "Enabled"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:81
+msgid "Plugin"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:127
+#: deluge/ui/webui/scripts/template_strings.py:34
+msgid "Name"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:137
+#: deluge/ui/webui/scripts/template_strings.py:57
+msgid "Seeders"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:142 deluge/ui/webui/register_menu.py:48
+#: deluge/ui/webui/scripts/template_strings.py:42
+msgid "Peers"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:155
+#: deluge/ui/webui/scripts/template_strings.py:23
+msgid "ETA"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:159
+#: deluge/ui/webui/scripts/template_strings.py:48
+msgid "Ratio"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:163
+msgid "Avail"
+msgstr ""
+
+#: deluge/ui/webui/render.py:174 deluge/ui/webui/utils.py:125
+#: deluge/ui/webui/utils.py:130
+msgid "∞"
+msgstr ""
+
+#: deluge/ui/webui/config_forms.py:107
+msgid "These changes were saved"
+msgstr ""
+
+#: deluge/ui/webui/config_forms.py:113
+msgid "Correct the errors above and try again"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:39
+#: deluge/ui/webui/scripts/template_strings.py:11
+msgid "Config"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:40
+msgid "Connect"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:41
+#: deluge/ui/webui/scripts/template_strings.py:2
+msgid "About"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:42
+#: deluge/ui/webui/scripts/template_strings.py:33
+msgid "Logout"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:44
+msgid "Statistics"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:45 deluge/ui/webui/register_menu.py:59
+#: deluge/ui/webui/scripts/template_strings.py:17
+msgid "Details"
+msgstr ""
+
 #: deluge/ui/webui/register_menu.py:46
+#: deluge/ui/webui/scripts/template_strings.py:37
 #: deluge/ui/gtkui/glade/connection_manager.glade:246
 msgid "Options"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:38
-#: deluge/ui/webui/config_tabs_webui.py:71
-msgid "Password"
+#: deluge/ui/webui/register_menu.py:47
+msgid "Trackers"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:39
-msgid "Password is invalid,try again"
+#: deluge/ui/webui/register_menu.py:49
+msgid "Files"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:40
-msgid "Pause"
+#: deluge/ui/webui/register_menu.py:53
+msgid "Stop"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:41
-msgid "Pause all"
+#: deluge/ui/webui/register_menu.py:54
+#: deluge/ui/webui/scripts/template_strings.py:64
+msgid "Start"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:42
-#: deluge/ui/webui/register_menu.py:48 deluge/ui/gtkui/torrentview.py:142
-msgid "Peers"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:43
-msgid "Pieces"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:44
-#: deluge/ui/gtkui/torrentview.py:133 deluge/ui/gtkui/files_tab.py:138
-msgid "Progress"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:45
-#: deluge/ui/webui/register_menu.py:56
-#: deluge/ui/gtkui/glade/main_window.glade:361
-msgid "Queue Down"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:46
-msgid "Queue Position"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:47
 #: deluge/ui/webui/register_menu.py:55
+#: deluge/ui/webui/scripts/template_strings.py:47
 #: deluge/ui/gtkui/glade/main_window.glade:346
 msgid "Queue Up"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:48
-#: deluge/ui/gtkui/torrentview.py:159
-msgid "Ratio"
+#: deluge/ui/webui/register_menu.py:56
+#: deluge/ui/webui/scripts/template_strings.py:45
+#: deluge/ui/gtkui/glade/main_window.glade:361
+msgid "Queue Down"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:57
+msgid "Queue Top"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:58
+msgid "Queue Bottom"
+msgstr ""
+
+#: deluge/ui/webui/register_menu.py:60
+msgid "Move"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:49
 #: deluge/ui/webui/register_menu.py:61
+#: deluge/ui/webui/scripts/template_strings.py:49
 msgid "Reannounce"
 msgstr ""
 
-#: deluge/ui/webui/scripts/template_strings.py:50
-msgid "Refresh"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:51
-msgid "Refresh page every:"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:52
-msgid "Remove"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:53
-msgid "Remove torrent"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:54
-msgid "Resume"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:55
-msgid "Resume all"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:56
-msgid "Save"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:57
-#: deluge/ui/gtkui/torrentview.py:137
-msgid "Seeders"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:58
-msgid "Set"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:59
-msgid "Set Timeout"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:60
-msgid "Settings"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:61
-msgid "Share Ratio"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:62
-#: deluge/ui/gtkui/addtorrentdialog.py:109 deluge/ui/gtkui/torrentview.py:129
-#: deluge/ui/gtkui/files_tab.py:125
-msgid "Size"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:63
-#: deluge/ui/gtkui/glade/dgtkpopups.glade:9
-msgid "Speed"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:64
-#: deluge/ui/webui/register_menu.py:54
-msgid "Start"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:65
-msgid "Submit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:66
-msgid "Torrent list"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:67
-msgid "Total Size"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:68
-#: deluge/ui/gtkui/edittrackersdialog.py:83
-#: deluge/plugins/label/label/gtkui.py:109
-msgid "Tracker"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:69
-msgid "Tracker Status"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:70
-#: deluge/ui/gtkui/systemtray.py:197
-msgid "Up"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:71
-#: deluge/ui/gtkui/peers_tab.py:133 deluge/ui/gtkui/torrentview.py:151
-msgid "Up Speed"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:72
-#: deluge/ui/gtkui/systemtray.py:316
-msgid "Upload"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:73
-#: deluge/ui/webui/torrent_add.py:67
-msgid "Upload torrent"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:74
-msgid "Uploaded"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:75
-#: deluge/ui/webui/torrent_add.py:65
-#: deluge/plugins/blocklist/blocklist/webui.py:78
-msgid "Url"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:76
-msgid "seconds"
-msgstr ""
-
-#: deluge/ui/webui/pages.py:270
-msgid "refresh must be > 0"
-msgstr ""
-
-#: deluge/ui/webui/pages.py:321
-msgid "no uri"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:43
-msgid "Download Location"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:44
-msgid "Compact Allocation"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:48 deluge/ui/webui/torrent_options.py:16
-msgid "Maximum Down Speed"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:50 deluge/ui/webui/torrent_options.py:18
-msgid "Maximum Up Speed"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:51 deluge/ui/webui/config_tabs_deluge.py:102
-#: deluge/ui/webui/config_tabs_deluge.py:117
-#: deluge/ui/webui/torrent_options.py:19
-#: deluge/plugins/label/label/webui_config.py:83
-msgid "Maximum Connections"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:52 deluge/ui/webui/config_tabs_deluge.py:105
-#: deluge/ui/webui/config_tabs_deluge.py:120
-#: deluge/ui/webui/torrent_options.py:20
-#: deluge/plugins/label/label/webui_config.py:86
-msgid "Maximum Upload Slots"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:55 deluge/ui/webui/config_tabs_deluge.py:131
-msgid "Prioritize first and last pieces"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:56
-msgid "Add In Paused State"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:57
-msgid "Set Private Flag"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:73
-msgid "Choose Files"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:104 deluge/ui/webui/torrent_options.py:41
-msgid "Error in torrent options."
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:118
-msgid "Choose an url or a torrent, not both."
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:130
-msgid "No data"
+#: deluge/ui/webui/register_menu.py:62
+msgid "Recheck"
 msgstr ""
 
 #: deluge/ui/webui/config_tabs_deluge.py:45
@@ -494,10 +656,6 @@ msgstr ""
 msgid "Forced"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:88 deluge/ui/gtkui/preferences.py:79
-msgid "Enabled"
-msgstr ""
-
 #: deluge/ui/webui/config_tabs_deluge.py:88
 msgid "Disabled"
 msgstr ""
@@ -536,18 +694,6 @@ msgstr ""
 msgid "-1 = Unlimited"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_deluge.py:103
-#: deluge/ui/webui/config_tabs_deluge.py:118
-#: deluge/plugins/label/label/webui_config.py:84
-msgid "Maximum Download Speed (Kib/s)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:104
-#: deluge/ui/webui/config_tabs_deluge.py:119
-#: deluge/plugins/label/label/webui_config.py:85
-msgid "Maximum Upload Speed (Kib/s)"
-msgstr ""
-
 #: deluge/ui/webui/config_tabs_deluge.py:107
 msgid "Maximum Half-Open Connections"
 msgstr ""
@@ -581,6 +727,10 @@ msgstr ""
 msgid "Use Compact Allocation"
 msgstr ""
 
+#: deluge/ui/webui/config_tabs_deluge.py:131 deluge/ui/webui/torrent_add.py:55
+msgid "Prioritize first and last pieces"
+msgstr ""
+
 #: deluge/ui/webui/config_tabs_deluge.py:137
 msgid "Daemon"
 msgstr ""
@@ -595,7 +745,7 @@ msgid "Port"
 msgstr ""
 
 #: deluge/ui/webui/config_tabs_deluge.py:140
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2144
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2146
 msgid "Allow Remote Connections"
 msgstr ""
 
@@ -608,7 +758,7 @@ msgid "-1 = unlimited"
 msgstr ""
 
 #: deluge/ui/webui/config_tabs_deluge.py:148
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2294
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2296
 msgid "Queue new torrents to top"
 msgstr ""
 
@@ -636,106 +786,8 @@ msgstr ""
 msgid "Enabled Plugins"
 msgstr ""
 
-#: deluge/ui/webui/config_tabs_webui.py:47
-#: deluge/ui/webui/config_tabs_webui.py:53
-msgid "Template"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:50
-msgid "Text and image"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:50
-msgid "Image Only"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:51
-msgid "Text Only"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:54
-msgid "Button style"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:55
-msgid "Cache templates"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:62
-msgid "Server"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:73
-msgid "Current Password"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:74
-msgid "New Password"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:75
-msgid "New Password (Confirm)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:82
-msgid "Old password is invalid"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:85
-msgid "New Password is not equal to New Password(confirm)"
-msgstr ""
-
-#: deluge/ui/webui/torrent_move.py:45
-msgid "Move To"
-msgstr ""
-
-#: deluge/ui/webui/torrent_move.py:72
-msgid "Error in Path."
-msgstr ""
-
-#: deluge/ui/webui/config_forms.py:107
-msgid "These changes were saved"
-msgstr ""
-
-#: deluge/ui/webui/config_forms.py:113
-msgid "Correct the errors above and try again"
-msgstr ""
-
-#: deluge/ui/webui/utils.py:125 deluge/ui/webui/utils.py:130
-#: deluge/ui/webui/render.py:174
-msgid "∞"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:23
-#: deluge/ui/gtkui/glade/main_window.glade:1943
-msgid "Prioritize First/Last"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:26
-#: deluge/ui/gtkui/glade/main_window.glade:1813
-msgid "Auto Managed"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:27
-msgid "Stop seed at ratio"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:29
-#: deluge/ui/gtkui/glade/main_window.glade:1871
-msgid "Remove at ratio"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-#: deluge/ui/gtkui/listview.py:84
-msgid "Unknown"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-msgid "Yes"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-msgid "No"
+#: deluge/ui/webui/lib/newforms_plus.py:141
+msgid "This folder does not exist."
 msgstr ""
 
 #: deluge/ui/webui/lib/newforms_portable/django/utils/translation.py:2
@@ -758,6 +810,14 @@ msgstr ""
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
+#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
+msgid "Yes"
+msgstr ""
+
+#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
+msgid "No"
+msgstr ""
+
 #: deluge/ui/webui/lib/newforms_portable/fields.py:46
 msgid "This field is required."
 msgstr ""
@@ -867,253 +927,321 @@ msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: deluge/ui/webui/lib/newforms_plus.py:141
-msgid "This folder does not exist."
+#: deluge/ui/webui/pages.py:270
+msgid "refresh must be > 0"
 msgstr ""
 
-#: deluge/ui/webui/lib/newforms_plus.py:193
-#: deluge/ui/webui/lib/newforms_plus.py:204 deluge/ui/gtkui/systemtray.py:187
-#: deluge/ui/gtkui/systemtray.py:191 deluge/ui/gtkui/systemtray.py:322
-#: deluge/ui/gtkui/statusbar.py:359 deluge/ui/gtkui/statusbar.py:387
-#: deluge/ui/gtkui/statusbar.py:414 deluge/common.py:181
-msgid "Unlimited"
+#: deluge/ui/webui/pages.py:321
+msgid "no uri"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:40
-msgid "Connect"
+#: deluge/ui/webui/torrent_move.py:45
+msgid "Move To"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:44
-msgid "Statistics"
+#: deluge/ui/webui/torrent_move.py:72
+msgid "Error in Path."
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:47
-msgid "Trackers"
+#: deluge/ui/webui/config_tabs_webui.py:47
+#: deluge/ui/webui/config_tabs_webui.py:53
+msgid "Template"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:49
-msgid "Files"
+#: deluge/ui/webui/config_tabs_webui.py:50
+msgid "Text and image"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:52
-#: deluge/plugins/label/label/webui_config.py:89
-msgid "Delete"
+#: deluge/ui/webui/config_tabs_webui.py:50
+msgid "Image Only"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:53
-msgid "Stop"
+#: deluge/ui/webui/config_tabs_webui.py:51
+msgid "Text Only"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:57
-msgid "Queue Top"
+#: deluge/ui/webui/config_tabs_webui.py:54
+msgid "Button style"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:58
-msgid "Queue Bottom"
+#: deluge/ui/webui/config_tabs_webui.py:55
+msgid "Cache templates"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:60
-msgid "Move"
+#: deluge/ui/webui/config_tabs_webui.py:62
+msgid "Server"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:62
-msgid "Recheck"
+#: deluge/ui/webui/config_tabs_webui.py:71
+#: deluge/ui/webui/scripts/template_strings.py:38
+msgid "Password"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:81
-msgid "Plugin"
+#: deluge/ui/webui/config_tabs_webui.py:73
+msgid "Current Password"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:90 deluge/ui/gtkui/queuedtorrents.py:71
-msgid "Torrent"
+#: deluge/ui/webui/config_tabs_webui.py:74
+msgid "New Password"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:98 deluge/ui/gtkui/files_tab.py:109
-msgid "Filename"
+#: deluge/ui/webui/config_tabs_webui.py:75
+msgid "New Password (Confirm)"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:449
-msgid "Choose a .torrent file"
+#: deluge/ui/webui/config_tabs_webui.py:82
+msgid "Old password is invalid"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:461
-msgid "Torrent files"
+#: deluge/ui/webui/config_tabs_webui.py:85
+msgid "New Password is not equal to New Password(confirm)"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:465
-msgid "All files"
+#: deluge/ui/webui/torrent_options.py:16 deluge/ui/webui/torrent_add.py:48
+msgid "Maximum Down Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:91
-msgid "Address"
+#: deluge/ui/webui/torrent_options.py:18 deluge/ui/webui/torrent_add.py:50
+msgid "Maximum Up Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:107
-msgid "Client"
+#: deluge/ui/webui/torrent_options.py:23
+#: deluge/ui/gtkui/glade/main_window.glade:1943
+msgid "Prioritize First/Last"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:77
-msgid "Set Unlimited"
+#: deluge/ui/webui/torrent_options.py:26
+#: deluge/ui/gtkui/glade/main_window.glade:1813
+msgid "Auto Managed"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:81
-msgid "Other.."
+#: deluge/ui/webui/torrent_options.py:27
+msgid "Stop seed at ratio"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:89
-msgid "On"
+#: deluge/ui/webui/torrent_options.py:29
+#: deluge/ui/gtkui/glade/main_window.glade:1871
+msgid "Remove at ratio"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:328
-msgid "Choose a directory to move files to"
+#: deluge/ui/webui/torrent_options.py:41 deluge/ui/webui/torrent_add.py:104
+msgid "Error in torrent options."
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:437
-msgid "Set Max Download Speed (KiB/s):"
+#: deluge/ui/webui/torrent_add.py:43
+msgid "Download Location"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:439
-msgid "Set Max Upload Speed (KiB/s):"
+#: deluge/ui/webui/torrent_add.py:44
+msgid "Compact Allocation"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:441
-msgid "Set Max Connections:"
+#: deluge/ui/webui/torrent_add.py:56
+msgid "Add In Paused State"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:443
-msgid "Set Max Upload Slots:"
+#: deluge/ui/webui/torrent_add.py:57
+msgid "Set Private Flag"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:56
-msgid "All"
+#: deluge/ui/webui/torrent_add.py:67
+#: deluge/ui/webui/scripts/template_strings.py:73
+msgid "Upload torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:57
-msgid "Downloading"
+#: deluge/ui/webui/torrent_add.py:73
+msgid "Choose Files"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:60
-msgid "Seeding"
+#: deluge/ui/webui/torrent_add.py:118
+msgid "Choose an url or a torrent, not both."
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:63
-msgid "Queued"
+#: deluge/ui/webui/torrent_add.py:130
+msgid "No data"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:66
-msgid "Paused"
+#: deluge/ui/webui/scripts/template_strings.py:1
+msgid "# Of Files"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:72
-msgid "Checking"
+#: deluge/ui/webui/scripts/template_strings.py:4
+msgid "Add Another (Stay in add page)"
 msgstr ""
 
-#: deluge/ui/gtkui/sidebar.py:76 deluge/plugins/label/label/webui_config.py:46
-#: deluge/plugins/label/label/gtkui.py:323
-msgid "Labels"
+#: deluge/ui/webui/scripts/template_strings.py:5
+msgid "Add Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:196
-msgid "Deluge"
+#: deluge/ui/webui/scripts/template_strings.py:6
+#: deluge/ui/gtkui/glade/main_window.glade:267
+msgid "Add torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:209 deluge/ui/gtkui/systemtray.py:215
-#: deluge/ui/gtkui/systemtray.py:321 deluge/ui/gtkui/statusbar.py:329
-#: deluge/ui/gtkui/statusbar.py:339 deluge/ui/gtkui/statusbar.py:352
-#: deluge/ui/gtkui/statusbar.py:380
-#: deluge/ui/gtkui/glade/main_window.glade:1665
-#: deluge/ui/gtkui/glade/main_window.glade:1679
-msgid "KiB/s"
+#: deluge/ui/webui/scripts/template_strings.py:7
+msgid "Auto refresh:"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:325 deluge/ui/gtkui/statusbar.py:361
-#: deluge/ui/gtkui/statusbar.py:389 deluge/ui/gtkui/statusbar.py:416
-#: deluge/common.py:238 deluge/common.py:239
-msgid "Other..."
+#: deluge/ui/webui/scripts/template_strings.py:8
+msgid "Ava"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:356
-msgid "Deluge is locked"
+#: deluge/ui/webui/scripts/template_strings.py:9
+msgid "Availability"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:359
-msgid ""
-"Deluge is password protected.\n"
-"To show the Deluge window, please enter your password"
+#: deluge/ui/webui/scripts/template_strings.py:10
+msgid "BandWidth"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:163
-msgid "Avail"
+#: deluge/ui/webui/scripts/template_strings.py:13
+msgid "DHT Nodes"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:151
-msgid "Priority"
+#: deluge/ui/webui/scripts/template_strings.py:14
+msgid "Debug:Data Dump"
 msgstr ""
 
-#: deluge/ui/gtkui/signals.py:142
-msgid "Torrent is past stop ratio."
+#: deluge/ui/webui/scripts/template_strings.py:15
+msgid "Delete .torrent file"
 msgstr ""
 
-#: deluge/ui/gtkui/queuedtorrents.py:131
-msgid " Torrents Queued"
+#: deluge/ui/webui/scripts/template_strings.py:16
+msgid "Delete downloaded files."
 msgstr ""
 
-#: deluge/ui/gtkui/queuedtorrents.py:133
-msgid " Torrent Queued"
+#: deluge/ui/webui/scripts/template_strings.py:18
+msgid "Disable"
 msgstr ""
 
-#: deluge/ui/gtkui/removetorrentdialog.py:65
-msgid ""
-"<big><b>Are you sure you want to remove the selected torrents?</b></big>"
+#: deluge/ui/webui/scripts/template_strings.py:22
+msgid "Downloaded"
 msgstr ""
 
-#: deluge/ui/gtkui/removetorrentdialog.py:66
-msgid "Remove Selected Torrents"
+#: deluge/ui/webui/scripts/template_strings.py:24
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1785
+msgid "Enable"
 msgstr ""
 
-#: deluge/ui/gtkui/aboutdialog.py:66
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 3 of the License, or (at your option) "
-"any later version. This program is distributed in the hope that it will be "
-"useful, but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
-"Public License for more details. You should have received a copy of the GNU "
-"General Public License along with this program; if not, see <http://www.gnu."
-"org/licenses>."
+#: deluge/ui/webui/scripts/template_strings.py:26
+msgid "Eta"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:134
-msgid "Not Connected"
+#: deluge/ui/webui/scripts/template_strings.py:27
+msgid "File"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:154
-msgid "Download Speed"
+#: deluge/ui/webui/scripts/template_strings.py:28
+msgid "Filter on Tracker"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:159
-msgid "Upload Speed"
+#: deluge/ui/webui/scripts/template_strings.py:29
+msgid "Filter on state"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:167
-msgid "No Incoming Connections!"
+#: deluge/ui/webui/scripts/template_strings.py:31
+msgid "Hash"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:363
-msgid "Download Speed (KiB/s):"
+#: deluge/ui/webui/scripts/template_strings.py:32
+msgid "Login"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:391
-msgid "Upload Speed (KiB/s):"
+#: deluge/ui/webui/scripts/template_strings.py:35
+msgid "Next Announce"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:418
-msgid "Connection Limit:"
+#: deluge/ui/webui/scripts/template_strings.py:39
+msgid "Password is invalid,try again"
 msgstr ""
 
-#: deluge/ui/gtkui/edittrackersdialog.py:81
-msgid "Tier"
+#: deluge/ui/webui/scripts/template_strings.py:40
+msgid "Pause"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:41
+msgid "Pause all"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:43
+msgid "Pieces"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:46
+msgid "Queue Position"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:50
+msgid "Refresh"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:51
+msgid "Refresh page every:"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:52
+msgid "Remove"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:53
+msgid "Remove torrent"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:54
+msgid "Resume"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:55
+msgid "Resume all"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:56
+msgid "Save"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:58
+msgid "Set"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:59
+msgid "Set Timeout"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:60
+msgid "Settings"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:61
+msgid "Share Ratio"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:63
+#: deluge/ui/gtkui/glade/dgtkpopups.glade:9
+msgid "Speed"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:65
+msgid "Submit"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:66
+msgid "Torrent list"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:67
+msgid "Total Size"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:69
+msgid "Tracker Status"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:74
+msgid "Uploaded"
+msgstr ""
+
+#: deluge/ui/webui/scripts/template_strings.py:76
+msgid "seconds"
 msgstr ""
 
 #: deluge/common.py:184
@@ -1125,182 +1253,287 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: deluge/plugins/label/label/gtk_sidebar.py:72
-msgid "Filters"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:30
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:404
+msgid "Type:"
 msgstr ""
 
-#: deluge/plugins/label/label/webui_config.py:58
-msgid "Select Label"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:60
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:392
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1114
+msgid "URL:"
 msgstr ""
 
-#: deluge/plugins/label/label/webui_config.py:88
-msgid "Apply"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:89
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:810
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2309
+#: deluge/ui/gtkui/glade/main_window.glade:2002
+msgid "<b>General</b>"
 msgstr ""
 
-#: deluge/plugins/label/label/webui_config.py:99
-msgid "Add Label"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:125
+msgid "Days"
 msgstr ""
 
-#: deluge/plugins/label/label/webui_config.py:108
-#: deluge/plugins/label/label/gtkui.py:104
-#: deluge/plugins/label/label/gtkui.py:272
-#: deluge/plugins/label/label/webui_pages.py:62
-msgid "Label"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:151
+msgid "Check for new list every:"
 msgstr ""
 
-#: deluge/plugins/label/label/webui_config.py:124
-msgid "Hide filter items with 0 hits"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:168
+msgid "Import blocklist on startup"
 msgstr ""
 
-#: deluge/plugins/label/label/gtkui.py:319
-msgid "Hide Zero Hits"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:186
+msgid "<b>Settings</b>"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:265
-msgid "Invalid label, valid characters:[a-z0-9_-]"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:218
+msgid "Download the blocklist file if necessary and import the file."
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:266
-msgid "Empty Label"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:238
+msgid "Check Download and Import"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:267
-#: deluge/plugins/label/label/core.py:281
-#: deluge/plugins/label/label/core.py:299
-#: deluge/plugins/label/label/core.py:331
-msgid "Unknown Label"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:259
+msgid "Download a new blocklist file and import it."
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:332
-msgid "Unknown Torrent"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:279
+msgid "Force Download and Import"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/peerguardian.py:31
-msgid "Invalid leader"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:304
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:537
+msgid "<b>Options</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/peerguardian.py:35
-msgid "Invalid magic code"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:416
+msgid "Date:"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/peerguardian.py:40
-msgid "Invalid version"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:428
+msgid "File Size:"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:46
-msgid "Emule IP list (GZip)"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:448
+msgid "<b>Info</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:47
-msgid "SafePeer Text (Zipped)"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:9
+msgid "Add Torrents"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:48
-msgid "PeerGuardian Text (Uncompressed)"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:44
+msgid "<big><b>Add Torrents</b></big>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:49
-msgid "PeerGuardian P2B (GZip)"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:145
+msgid "From _File"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:58
-msgid "BlockList"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:192
+msgid "From _URL"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:79
-msgid "Check for every (days)"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:239
+msgid "From _Hash"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:80
-msgid "Timeout (seconds)"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:285
+msgid "_Remove"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:81
-msgid "Times to attempt download"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:318
+msgid "<b>Torrents</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:82
-msgid "Import on daemon startup"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:372
+msgid "Fi_les"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:84
-msgid "Download Now"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:413
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:197
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:244
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:320
+msgid "Select A Folder"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:85
-msgid "Import Now"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:433
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:270
+msgid "<b>Download Location</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:92
-#, python-format
-msgid "Downloading %.2f%%"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:487
+msgid "Compact"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:94
-#, python-format
-msgid "Importing %s"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:507
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:487
+msgid "<b>Allocation</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:96
-#, python-format
-msgid "Blocked Ranges: %s"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:596
+#: deluge/ui/gtkui/glade/main_window.glade:1653
+msgid "Max Upload Slots:"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:98
-msgid "Inactive"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:610
+#: deluge/ui/gtkui/glade/main_window.glade:1716
+msgid "Max Connections:"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:105
-msgid "Refresh status"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:624
+msgid "Max Up Speed:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:10
-#: deluge/ui/gtkui/glade/main_window.glade:398
-#: deluge/ui/gtkui/glade/main_window.glade:399
-msgid "Connection Manager"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:638
+msgid "Max Down Speed:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:42
-msgid "<big><b>Connection Manager</b></big>"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:668
+#: deluge/ui/gtkui/glade/main_window.glade:1783
+msgid "<b>Bandwidth</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:101
-#: deluge/ui/gtkui/glade/connection_manager.glade:405
-#: deluge/ui/gtkui/glade/queuedtorrents.glade:171
-#: deluge/ui/gtkui/glade/edit_trackers.glade:108
-msgid "gtk-add"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:704
+msgid "Add In _Paused State"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:152
-msgid "_Start local daemon"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:719
+msgid "Prioritize First/Last Pieces"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:204
-msgid "Automatically connect to selected host on start-up"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:735
+#: deluge/ui/gtkui/glade/main_window.glade:1930
+msgid "Private"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:215
-msgid "Automatically start localhost if needed"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:777
+#: deluge/ui/gtkui/glade/torrent_menu.glade:130
+#: deluge/ui/gtkui/glade/main_window.glade:1977
+msgid "_Edit Trackers"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:229
-msgid "Do not show this dialog on start-up"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:867
+msgid "Revert To Defaults"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:285
-msgid "gtk-connect"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:921
+msgid "Apply To All"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:308
-msgid "Add Host"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:968
+#: deluge/ui/gtkui/glade/main_window.glade:2079
+msgid "_Options"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:327
-msgid "Hostname:"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1044
+#: deluge/ui/gtkui/glade/edit_trackers.glade:223
+msgid "Add Tracker"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/connection_manager.glade:349
-msgid "Port:"
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1080
+msgid "<b>From URL</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:11
+msgid "_Open Folder"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:48
+msgid "Resume selected torrents."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:49
+msgid "Resu_me"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:71
+msgid "Opt_ions"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:93
+msgid "_Queue"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:113
+msgid "_Update Tracker"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:152
+msgid "_Remove Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:173
+msgid "_Force Re-check"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:190
+msgid "Move _Storage"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:211
+msgid "From Session"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:220
+msgid ".. And Delete Torrent File"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:229
+msgid ".. And Delete Downloaded Files"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:238
+msgid ".. And Delete All Files"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:251
+#: deluge/ui/gtkui/glade/tray_menu.glade:87
+msgid "_Download Speed Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:266
+#: deluge/ui/gtkui/glade/tray_menu.glade:103
+msgid "_Upload Speed Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:281
+msgid "_Connection Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:297
+msgid "Upload _Slot Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:312
+msgid "_Auto Managed"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:8
+#: deluge/ui/gtkui/glade/main_window.glade:2099
+msgid "Remove Torrent?"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:44
+#: deluge/ui/gtkui/glade/main_window.glade:2135
+msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:95
+#: deluge/ui/gtkui/glade/main_window.glade:2186
+msgid "<i>The associated .torrent will be deleted!</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:134
+#: deluge/ui/gtkui/glade/main_window.glade:2225
+msgid "<i>The downloaded data will be deleted!</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:179
+#: deluge/ui/gtkui/glade/main_window.glade:2269
+msgid "Remove Selected Torrent"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:8
@@ -1328,22 +1561,10 @@ msgstr ""
 msgid "Default download location:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:197
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:244
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:320
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:413
-msgid "Select A Folder"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:229
 msgid "Move completed to:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:270
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:433
-msgid "<b>Download Location</b>"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:305
 msgid "Save copy of .torrent file:"
 msgstr ""
@@ -1374,11 +1595,6 @@ msgstr ""
 msgid "Compact allocation only allocates space as needed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:487
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:507
-msgid "<b>Allocation</b>"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:521
 msgid "Prioritize first and last pieces of files in torrent"
 msgstr ""
@@ -1387,11 +1603,6 @@ msgstr ""
 msgid "Prioritize first and last pieces of torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:537
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:304
-msgid "<b>Options</b>"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:562
 msgid "page 6"
 msgstr ""
@@ -1528,7 +1739,7 @@ msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1231
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1466
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1468
 msgid "Maximum Download Speed (KiB/s):"
 msgstr ""
 
@@ -1538,17 +1749,17 @@ msgid "The maximum number of connections allowed.  Set -1 for unlimited."
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1263
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1479
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1481
 msgid "Maximum Upload Slots:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1276
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1492
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1494
 msgid "Maximum Connections:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1287
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1455
 msgid "Maximum Upload Speed (KiB/s):"
 msgstr ""
 
@@ -1556,65 +1767,65 @@ msgstr ""
 msgid "Maximum Half-Open Connections:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1310
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1311
 msgid "Maximum Connection Attempts per Second:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1359
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1361
 msgid "Ignore limits on local network"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1377
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1379
 msgid "<b>Global Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1416
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1434
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1502
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1418
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1436
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1504
 msgid "The maximum number of connections per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1518
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1520
 msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1541
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1543
 msgid "<b>Per Torrent Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1568
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1570
 msgid "page 8"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1599
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1601
 msgid "<i><b><big>Interface</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1633
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1635
 msgid "Enable system tray icon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1648
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1650
 msgid "Minimize to tray on close"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1667
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1669
 msgid "Start in tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1688
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1690
 msgid "Password protect system tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1715
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1717
 msgid "Password:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1750
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1752
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1782
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1784
 msgid ""
 "Classic Mode will hide most of the daemon functionality and will make Deluge "
 "appear to be a single application.  Use this if you do not want to take "
@@ -1622,162 +1833,118 @@ msgid ""
 "setting to take effect."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1794
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1796
 msgid "<b>Classic Mode</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1846
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1848
 msgid "<i><b><big>Other</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1888
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1890
 msgid ""
 "Deluge will check our servers and will tell you if a newer version has been "
 "released"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1889
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1891
 msgid "Be alerted about new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1908
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1910
 msgid "<b>Updates</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1944
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1946
 msgid ""
 "Help us improve Deluge by sending us your Python version, PyGTK version, OS "
 "and processor types.  Absolutely no other information is sent."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1963
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1965
 msgid "Yes, please send anonymous statistics"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1982
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1984
 msgid "<b>System Information</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2035
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2037
 msgid "<i><b><big>Daemon</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2077
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2079
 msgid "Daemon port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2112
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2114
 msgid "<b>Port</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2155
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2157
 msgid "<b>Connections</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2187
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2189
 msgid "Periodically check the website for new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2198
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2200
 msgid "<b>Other</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2251
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2253
 msgid "<i><b><big>Queue</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2307
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:810
-#: deluge/ui/gtkui/glade/main_window.glade:2002
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:89
-msgid "<b>General</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2348
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2350
 msgid "Total active downloading:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2379
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2381
 msgid "Total active:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2389
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2391
 msgid "Total active seeding:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2437
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2439
 msgid "Do not count slow torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2455
 msgid "<b>Active Torrents</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2542
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2544
 msgid "Seed Time (m):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2554
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2556
 msgid "Seed Time Ratio:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2566
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2568
 msgid "Share Ratio Limit:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2584
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2586
 msgid "Stop seeding when share ratio reaches:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2629
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2631
 msgid "Remove torrent when share ratio reached"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2647
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2649
 msgid "<b>Seeding</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2705
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2707
 msgid "<i><b><big>Plugins</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/queuedtorrents.glade:8
-msgid "Queued Torrents"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/queuedtorrents.glade:47
-msgid "<big><b>Add Queued Torrents</b></big>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/queuedtorrents.glade:127
-msgid "Automatically add torrents on connect"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:8
-#: deluge/ui/gtkui/glade/main_window.glade:2099
-msgid "Remove Torrent?"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:44
-#: deluge/ui/gtkui/glade/main_window.glade:2135
-msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:95
-#: deluge/ui/gtkui/glade/main_window.glade:2186
-msgid "<i>The associated .torrent will be deleted!</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:134
-#: deluge/ui/gtkui/glade/main_window.glade:2225
-msgid "<i>The downloaded data will be deleted!</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:179
-#: deluge/ui/gtkui/glade/main_window.glade:2269
-msgid "Remove Selected Torrent"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
 msgid "Edit Trackers"
 msgstr ""
@@ -1786,13 +1953,15 @@ msgstr ""
 msgid "<big><b>Edit Trackers</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/edit_trackers.glade:122
-msgid "gtk-edit"
+#: deluge/ui/gtkui/glade/edit_trackers.glade:108
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:171
+#: deluge/ui/gtkui/glade/connection_manager.glade:101
+#: deluge/ui/gtkui/glade/connection_manager.glade:405
+msgid "gtk-add"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/edit_trackers.glade:223
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1044
-msgid "Add Tracker"
+#: deluge/ui/gtkui/glade/edit_trackers.glade:122
+msgid "gtk-edit"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/edit_trackers.glade:259
@@ -1812,6 +1981,18 @@ msgstr ""
 msgid "<b>Edit Tracker</b>"
 msgstr ""
 
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:8
+msgid "Queued Torrents"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:47
+msgid "<big><b>Add Queued Torrents</b></big>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:127
+msgid "Automatically add torrents on connect"
+msgstr ""
+
 #: deluge/ui/gtkui/glade/move_storage_dialog.glade:9
 msgid "Move Storage"
 msgstr ""
@@ -1824,179 +2005,46 @@ msgstr ""
 msgid "Destination:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:9
-msgid "Add Torrents"
+#: deluge/ui/gtkui/glade/connection_manager.glade:10
+#: deluge/ui/gtkui/glade/main_window.glade:398
+#: deluge/ui/gtkui/glade/main_window.glade:399
+msgid "Connection Manager"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:44
-msgid "<big><b>Add Torrents</b></big>"
+#: deluge/ui/gtkui/glade/connection_manager.glade:42
+msgid "<big><b>Connection Manager</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:145
-msgid "From _File"
+#: deluge/ui/gtkui/glade/connection_manager.glade:152
+msgid "_Start local daemon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:192
-msgid "From _URL"
+#: deluge/ui/gtkui/glade/connection_manager.glade:204
+msgid "Automatically connect to selected host on start-up"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:239
-msgid "From _Hash"
+#: deluge/ui/gtkui/glade/connection_manager.glade:215
+msgid "Automatically start localhost if needed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:285
-msgid "_Remove"
+#: deluge/ui/gtkui/glade/connection_manager.glade:229
+msgid "Do not show this dialog on start-up"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:318
-msgid "<b>Torrents</b>"
+#: deluge/ui/gtkui/glade/connection_manager.glade:285
+msgid "gtk-connect"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:372
-msgid "Fi_les"
+#: deluge/ui/gtkui/glade/connection_manager.glade:308
+msgid "Add Host"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:487
-msgid "Compact"
+#: deluge/ui/gtkui/glade/connection_manager.glade:327
+msgid "Hostname:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:596
-#: deluge/ui/gtkui/glade/main_window.glade:1653
-msgid "Max Upload Slots:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:610
-#: deluge/ui/gtkui/glade/main_window.glade:1716
-msgid "Max Connections:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:624
-msgid "Max Up Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:638
-msgid "Max Down Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:668
-#: deluge/ui/gtkui/glade/main_window.glade:1783
-msgid "<b>Bandwidth</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:704
-msgid "Add In _Paused State"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:719
-msgid "Prioritize First/Last Pieces"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:735
-#: deluge/ui/gtkui/glade/main_window.glade:1930
-msgid "Private"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:777
-#: deluge/ui/gtkui/glade/torrent_menu.glade:130
-#: deluge/ui/gtkui/glade/main_window.glade:1977
-msgid "_Edit Trackers"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:867
-msgid "Revert To Defaults"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:921
-msgid "Apply To All"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:968
-#: deluge/ui/gtkui/glade/main_window.glade:2079
-msgid "_Options"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1080
-msgid "<b>From URL</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1114
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:60
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:392
-msgid "URL:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:11
-msgid "_Open Folder"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:48
-msgid "Resume selected torrents."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:49
-msgid "Resu_me"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:71
-msgid "Opt_ions"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:93
-msgid "_Queue"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:113
-msgid "_Update Tracker"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:152
-msgid "_Remove Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:173
-msgid "_Force Re-check"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:190
-msgid "Move _Storage"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:211
-msgid "From Session"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:220
-msgid ".. And Delete Torrent File"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:229
-msgid ".. And Delete Downloaded Files"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:238
-msgid ".. And Delete All Files"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:251
-#: deluge/ui/gtkui/glade/tray_menu.glade:87
-msgid "_Download Speed Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:266
-#: deluge/ui/gtkui/glade/tray_menu.glade:103
-msgid "_Upload Speed Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:281
-msgid "_Connection Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:297
-msgid "Upload _Slot Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:312
-msgid "_Auto Managed"
+#: deluge/ui/gtkui/glade/connection_manager.glade:349
+msgid "Port:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/tray_menu.glade:12
@@ -2269,52 +2317,3 @@ msgstr ""
 #: deluge/ui/gtkui/glade/main_window.glade:2454
 msgid "_Goto Website"
 msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:30
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:404
-msgid "Type:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:125
-msgid "Days"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:151
-msgid "Check for new list every:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:168
-msgid "Import blocklist on startup"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:186
-msgid "<b>Settings</b>"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:218
-msgid "Download the blocklist file if necessary and import the file."
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:238
-msgid "Check Download and Import"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:259
-msgid "Download a new blocklist file and import it."
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:279
-msgid "Force Download and Import"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:416
-msgid "Date:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:428
-msgid "File Size:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:448
-msgid "<b>Info</b>"
-msgstr ""