diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index 0d7091e20..cfc4f883f 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -1,190 +1,182 @@
-deluge/error.py
-deluge/bencode.py
-deluge/component.py
-deluge/log.py
+deluge/event.py
+deluge/httpdownloader.py
+deluge/common.py
 deluge/main.py
-deluge/decorators.py
-deluge/__init__.py
+deluge/metafile.py
+deluge/log.py
 deluge/pluginmanagerbase.py
 deluge/config.py
-deluge/common.py
-deluge/maketorrent.py
-deluge/rencode.py
-deluge/metafile.py
-deluge/_libtorrent.py
-deluge/preferencesmanager.py
-deluge/httpdownloader.py
 deluge/__rpcapi.py
-deluge/event.py
+deluge/__init__.py
+deluge/component.py
+deluge/maketorrent.py
+deluge/_libtorrent.py
+deluge/decorators.py
+deluge/bencode.py
+deluge/rencode.py
 deluge/configmanager.py
-deluge/core/daemon.py
-deluge/core/pluginmanager.py
-deluge/core/rpcserver.py
-deluge/core/authmanager.py
-deluge/core/autoadd.py
-deluge/core/eventmanager.py
-deluge/core/__init__.py
-deluge/core/oldstateupgrader.py
-deluge/core/alertmanager.py
-deluge/core/preferencesmanager.py
-deluge/core/torrent.py
-deluge/core/filtermanager.py
-deluge/core/core.py
-deluge/core/torrentmanager.py
-deluge/ui/countries.py
-deluge/ui/client.py
-deluge/ui/Win32IconImagePlugin.py
-deluge/ui/ui.py
-deluge/ui/sessionproxy.py
-deluge/ui/__init__.py
-deluge/ui/common.py
-deluge/ui/tracker_icons.py
-deluge/ui/session.py
-deluge/ui/coreconfig.py
-deluge/ui/gtkui/pluginmanager.py
-deluge/ui/gtkui/systemtray.py
-deluge/ui/gtkui/queuedtorrents.py
-deluge/ui/gtkui/aboutdialog.py
-deluge/ui/gtkui/files_tab.py
-deluge/ui/gtkui/torrentdetails.py
-deluge/ui/gtkui/dialogs.py
-deluge/ui/gtkui/gtkui.py
-deluge/ui/gtkui/toolbar.py
-deluge/ui/gtkui/options_tab.py
-deluge/ui/gtkui/notification.py
-deluge/ui/gtkui/status_tab.py
-deluge/ui/gtkui/details_tab.py
-deluge/ui/gtkui/listview.py
-deluge/ui/gtkui/addtorrentdialog.py
-deluge/ui/gtkui/__init__.py
-deluge/ui/gtkui/filtertreeview.py
-deluge/ui/gtkui/edittrackersdialog.py
-deluge/ui/gtkui/sidebar.py
-deluge/ui/gtkui/statusbar.py
-deluge/ui/gtkui/removetorrentdialog.py
-deluge/ui/gtkui/peers_tab.py
-deluge/ui/gtkui/ipcinterface.py
-deluge/ui/gtkui/new_release_dialog.py
-deluge/ui/gtkui/common.py
-deluge/ui/gtkui/menubar.py
-deluge/ui/gtkui/connectionmanager.py
-deluge/ui/gtkui/createtorrentdialog.py
-deluge/ui/gtkui/preferences.py
-deluge/ui/gtkui/mainwindow.py
-deluge/ui/gtkui/preferences_old.py
-deluge/ui/gtkui/torrentview.py
-deluge/ui/gtkui/glade/create_torrent_dialog.glade
-deluge/ui/gtkui/glade/filtertree_menu.glade
-deluge/ui/gtkui/glade/dgtkpopups.glade
-deluge/ui/gtkui/glade/torrent_menu.glade
-deluge/ui/gtkui/glade/main_window.glade
-deluge/ui/gtkui/glade/remove_torrent_dialog.glade
-deluge/ui/gtkui/glade/tray_menu.glade
-deluge/ui/gtkui/glade/preferences_dialog.glade
-deluge/ui/gtkui/glade/edit_trackers.glade
-deluge/ui/gtkui/glade/move_storage_dialog.glade
-deluge/ui/gtkui/glade/connection_manager.glade
-deluge/ui/gtkui/glade/add_torrent_dialog.glade
-deluge/ui/gtkui/glade/queuedtorrents.glade
-deluge/ui/console/colors.py
-deluge/ui/console/statusbars.py
-deluge/ui/console/main.py
-deluge/ui/console/eventlog.py
-deluge/ui/console/__init__.py
-deluge/ui/console/screen.py
-deluge/ui/console/commands/add.py
-deluge/ui/console/commands/info.py
-deluge/ui/console/commands/halt.py
-deluge/ui/console/commands/__init__.py
-deluge/ui/console/commands/connect.py
-deluge/ui/console/commands/resume.py
-deluge/ui/console/commands/config.py
-deluge/ui/console/commands/quit.py
-deluge/ui/console/commands/rm.py
-deluge/ui/console/commands/help.py
-deluge/ui/console/commands/pause.py
-deluge/ui/console/commands/recheck.py
-deluge/ui/console/commands/cache.py
-deluge/ui/console/commands/plugin.py
-deluge/ui/console/commands/debug.py
-deluge/ui/web/pluginmanager.py
-deluge/ui/web/web.py
-deluge/ui/web/gen_gettext.py
-deluge/ui/web/__init__.py
-deluge/ui/web/server.py
-deluge/ui/web/common.py
-deluge/ui/web/auth.py
-deluge/ui/web/json_api.py
-deluge/plugins/__init__.py
-deluge/plugins/pluginbase.py
+deluge/error.py
 deluge/plugins/init.py
+deluge/plugins/pluginbase.py
+deluge/plugins/__init__.py
 deluge/plugins/notifications/setup.py
-deluge/plugins/notifications/notifications/gtkui.py
-deluge/plugins/notifications/notifications/__init__.py
 deluge/plugins/notifications/notifications/common.py
 deluge/plugins/notifications/notifications/webui.py
-deluge/plugins/notifications/notifications/core.py
+deluge/plugins/notifications/notifications/__init__.py
 deluge/plugins/notifications/notifications/test.py
+deluge/plugins/notifications/notifications/gtkui.py
+deluge/plugins/notifications/notifications/core.py
 deluge/plugins/notifications/notifications/data/config.glade
-deluge/plugins/freespace/build/lib/freespace/gtkui.py
-deluge/plugins/freespace/build/lib/freespace/__init__.py
-deluge/plugins/freespace/build/lib/freespace/common.py
-deluge/plugins/freespace/build/lib/freespace/webui.py
-deluge/plugins/freespace/build/lib/freespace/core.py
-deluge/plugins/freespace/build/lib/freespace/data/config.glade
-deluge/plugins/webui/setup.py
-deluge/plugins/webui/webui/gtkui.py
-deluge/plugins/webui/webui/__init__.py
-deluge/plugins/webui/webui/common.py
-deluge/plugins/webui/webui/core.py
-deluge/plugins/webui/webui/data/config.glade
 deluge/plugins/autoadd/setup.py
-deluge/plugins/autoadd/autoadd/gtkui.py
-deluge/plugins/autoadd/autoadd/__init__.py
 deluge/plugins/autoadd/autoadd/common.py
 deluge/plugins/autoadd/autoadd/webui.py
+deluge/plugins/autoadd/autoadd/__init__.py
+deluge/plugins/autoadd/autoadd/gtkui.py
 deluge/plugins/autoadd/autoadd/core.py
 deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
 deluge/plugins/autoadd/autoadd/data/config.glade
+deluge/plugins/scheduler/setup.py
+deluge/plugins/scheduler/scheduler/common.py
+deluge/plugins/scheduler/scheduler/webui.py
+deluge/plugins/scheduler/scheduler/__init__.py
+deluge/plugins/scheduler/scheduler/gtkui.py
+deluge/plugins/scheduler/scheduler/core.py
 deluge/plugins/label/setup.py
-deluge/plugins/label/label/__init__.py
 deluge/plugins/label/label/webui.py
-deluge/plugins/label/label/core.py
+deluge/plugins/label/label/__init__.py
 deluge/plugins/label/label/test.py
-deluge/plugins/label/label/gtkui/sidebar_menu.py
+deluge/plugins/label/label/core.py
 deluge/plugins/label/label/gtkui/submenu.py
 deluge/plugins/label/label/gtkui/__init__.py
+deluge/plugins/label/label/gtkui/sidebar_menu.py
 deluge/plugins/label/label/gtkui/label_config.py
 deluge/plugins/label/label/data/label_options.glade
 deluge/plugins/label/label/data/label_pref.glade
-deluge/plugins/blocklist/setup.py
-deluge/plugins/blocklist/blocklist/readers.py
-deluge/plugins/blocklist/blocklist/gtkui.py
-deluge/plugins/blocklist/blocklist/__init__.py
-deluge/plugins/blocklist/blocklist/common.py
-deluge/plugins/blocklist/blocklist/peerguardian.py
-deluge/plugins/blocklist/blocklist/decompressers.py
-deluge/plugins/blocklist/blocklist/webui.py
-deluge/plugins/blocklist/blocklist/detect.py
-deluge/plugins/blocklist/blocklist/core.py
-deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
 deluge/plugins/extractor/setup.py
-deluge/plugins/extractor/extractor/gtkui.py
-deluge/plugins/extractor/extractor/__init__.py
 deluge/plugins/extractor/extractor/common.py
 deluge/plugins/extractor/extractor/webui.py
+deluge/plugins/extractor/extractor/__init__.py
+deluge/plugins/extractor/extractor/gtkui.py
 deluge/plugins/extractor/extractor/core.py
 deluge/plugins/extractor/extractor/data/extractor_prefs.glade
+deluge/plugins/webui/setup.py
+deluge/plugins/webui/webui/common.py
+deluge/plugins/webui/webui/__init__.py
+deluge/plugins/webui/webui/gtkui.py
+deluge/plugins/webui/webui/core.py
+deluge/plugins/webui/webui/data/config.glade
+deluge/plugins/blocklist/setup.py
+deluge/plugins/blocklist/blocklist/common.py
+deluge/plugins/blocklist/blocklist/webui.py
+deluge/plugins/blocklist/blocklist/peerguardian.py
+deluge/plugins/blocklist/blocklist/__init__.py
+deluge/plugins/blocklist/blocklist/decompressers.py
+deluge/plugins/blocklist/blocklist/readers.py
+deluge/plugins/blocklist/blocklist/detect.py
+deluge/plugins/blocklist/blocklist/gtkui.py
+deluge/plugins/blocklist/blocklist/core.py
+deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
 deluge/plugins/execute/setup.py
-deluge/plugins/execute/execute/gtkui.py
-deluge/plugins/execute/execute/__init__.py
 deluge/plugins/execute/execute/common.py
 deluge/plugins/execute/execute/webui.py
+deluge/plugins/execute/execute/__init__.py
+deluge/plugins/execute/execute/gtkui.py
 deluge/plugins/execute/execute/core.py
 deluge/plugins/execute/execute/data/execute_prefs.glade
-deluge/plugins/scheduler/setup.py
-deluge/plugins/scheduler/scheduler/gtkui.py
-deluge/plugins/scheduler/scheduler/__init__.py
-deluge/plugins/scheduler/scheduler/common.py
-deluge/plugins/scheduler/scheduler/webui.py
-deluge/plugins/scheduler/scheduler/core.py
+deluge/core/eventmanager.py
+deluge/core/torrent.py
+deluge/core/oldstateupgrader.py
+deluge/core/authmanager.py
+deluge/core/__init__.py
+deluge/core/torrentmanager.py
+deluge/core/autoadd.py
+deluge/core/alertmanager.py
+deluge/core/filtermanager.py
+deluge/core/preferencesmanager.py
+deluge/core/rpcserver.py
+deluge/core/daemon.py
+deluge/core/core.py
+deluge/core/pluginmanager.py
+deluge/ui/ui.py
+deluge/ui/common.py
+deluge/ui/coreconfig.py
+deluge/ui/countries.py
+deluge/ui/__init__.py
+deluge/ui/sessionproxy.py
+deluge/ui/client.py
+deluge/ui/Win32IconImagePlugin.py
+deluge/ui/tracker_icons.py
+deluge/ui/web/common.py
+deluge/ui/web/gen_gettext.py
+deluge/ui/web/json_api.py
+deluge/ui/web/web.py
+deluge/ui/web/__init__.py
+deluge/ui/web/server.py
+deluge/ui/web/auth.py
+deluge/ui/web/pluginmanager.py
+deluge/ui/gtkui/peers_tab.py
+deluge/ui/gtkui/queuedtorrents.py
+deluge/ui/gtkui/common.py
+deluge/ui/gtkui/mainwindow.py
+deluge/ui/gtkui/systemtray.py
+deluge/ui/gtkui/notification.py
+deluge/ui/gtkui/options_tab.py
+deluge/ui/gtkui/new_release_dialog.py
+deluge/ui/gtkui/torrentdetails.py
+deluge/ui/gtkui/preferences.py
+deluge/ui/gtkui/addtorrentdialog.py
+deluge/ui/gtkui/createtorrentdialog.py
+deluge/ui/gtkui/statusbar.py
+deluge/ui/gtkui/__init__.py
+deluge/ui/gtkui/removetorrentdialog.py
+deluge/ui/gtkui/listview.py
+deluge/ui/gtkui/edittrackersdialog.py
+deluge/ui/gtkui/ipcinterface.py
+deluge/ui/gtkui/details_tab.py
+deluge/ui/gtkui/filtertreeview.py
+deluge/ui/gtkui/aboutdialog.py
+deluge/ui/gtkui/toolbar.py
+deluge/ui/gtkui/sidebar.py
+deluge/ui/gtkui/connectionmanager.py
+deluge/ui/gtkui/gtkui.py
+deluge/ui/gtkui/status_tab.py
+deluge/ui/gtkui/menubar.py
+deluge/ui/gtkui/files_tab.py
+deluge/ui/gtkui/dialogs.py
+deluge/ui/gtkui/torrentview.py
+deluge/ui/gtkui/pluginmanager.py
+deluge/ui/gtkui/glade/main_window.glade
+deluge/ui/gtkui/glade/filtertree_menu.glade
+deluge/ui/gtkui/glade/add_torrent_dialog.glade
+deluge/ui/gtkui/glade/create_torrent_dialog.glade
+deluge/ui/gtkui/glade/queuedtorrents.glade
+deluge/ui/gtkui/glade/dgtkpopups.glade
+deluge/ui/gtkui/glade/connection_manager.glade
+deluge/ui/gtkui/glade/preferences_dialog.glade
+deluge/ui/gtkui/glade/tray_menu.glade
+deluge/ui/gtkui/glade/torrent_menu.glade
+deluge/ui/gtkui/glade/remove_torrent_dialog2.glade
+deluge/ui/gtkui/glade/edit_trackers.glade
+deluge/ui/gtkui/glade/remove_torrent_dialog.glade
+deluge/ui/gtkui/glade/move_storage_dialog.glade
+deluge/ui/console/main.py
+deluge/ui/console/screen.py
+deluge/ui/console/eventlog.py
+deluge/ui/console/__init__.py
+deluge/ui/console/colors.py
+deluge/ui/console/statusbars.py
+deluge/ui/console/commands/rm.py
+deluge/ui/console/commands/cache.py
+deluge/ui/console/commands/info.py
+deluge/ui/console/commands/debug.py
+deluge/ui/console/commands/quit.py
+deluge/ui/console/commands/resume.py
+deluge/ui/console/commands/config.py
+deluge/ui/console/commands/__init__.py
+deluge/ui/console/commands/halt.py
+deluge/ui/console/commands/recheck.py
+deluge/ui/console/commands/connect.py
+deluge/ui/console/commands/plugin.py
+deluge/ui/console/commands/pause.py
+deluge/ui/console/commands/help.py
+deluge/ui/console/commands/add.py
diff --git a/deluge/i18n/deluge.pot b/deluge/i18n/deluge.pot
index 7d896d9c9..8e1a3e8c2 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: 2011-02-19 11:23-0800\n"
+"POT-Creation-Date: 2011-06-19 19:12+0100\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"
@@ -17,18 +17,705 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: deluge/common.py:256
+#: deluge/common.py:275
 msgid "KiB"
 msgstr ""
 
-#: deluge/common.py:259
+#: deluge/common.py:278
 msgid "MiB"
 msgstr ""
 
-#: deluge/common.py:261
+#: deluge/common.py:280
 msgid "GiB"
 msgstr ""
 
+#: deluge/plugins/notifications/notifications/gtkui.py:178
+msgid "Notification Blink shown"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:183
+msgid "Popup notification is not enabled."
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:185
+msgid "pynotify is not installed"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:193
+msgid "pynotify failed to show notification"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:196
+msgid "Notification popup shown"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:200
+msgid "Sound notification not enabled"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:202
+msgid "pygame is not installed"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:214
+#, python-format
+msgid "Sound notification failed %s"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:218
+msgid "Sound notification Success"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:241
+msgid "Finished Torrent"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:242
+#, python-format
+msgid ""
+"The torrent \"%(name)s\" including %(num_files)i has finished downloading."
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/gtkui.py:646
+msgid "Choose Sound File"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:138
+#: deluge/plugins/notifications/notifications/core.py:171
+#, python-format
+msgid "There was an error sending the notification email: %s"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:157
+#, python-format
+msgid "The server didn't reply properly to the helo greeting: %s"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:162
+#, python-format
+msgid "The server didn't accept the username/password combination: %s"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:186
+msgid "Notification email sent."
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:194
+#, python-format
+msgid "Finished Torrent \"%(name)s\""
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/core.py:196
+#, python-format
+msgid ""
+"This email is to inform you that Deluge has finished downloading \"%(name)s"
+"\", which includes %(num_files)i files.\n"
+"To stop receiving these alerts, simply turn off email notification in "
+"Deluge's preferences.\n"
+"\n"
+"Thank you,\n"
+"Deluge."
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:29
+msgid "<b><i><big>Notifications</big></i></b>"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:81
+msgid "Tray icon blinks enabled"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:93
+msgid "Popups enabled"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:108
+msgid "Sound enabled"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:144
+msgid "<b>UI Notifications</b>"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:175
+#: deluge/ui/gtkui/glade/connection_manager.glade:28
+msgid "Hostname:"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:199
+#: deluge/ui/gtkui/glade/connection_manager.glade:56
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3357
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3541
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3725
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3911
+msgid "Port:"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:231
+#: deluge/ui/gtkui/glade/connection_manager.glade:143
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3438
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3622
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3806
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3993
+msgid "Username:"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:255
+#: deluge/ui/gtkui/glade/connection_manager.glade:132
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2128
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3305
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3489
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3673
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3857
+msgid "Password:"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:360
+msgid "<b>Recipients</b>"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:383
+msgid "Server requires TLS/SSL"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:398
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:632
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:782
+msgid "From:"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:421
+#: deluge/ui/gtkui/preferences.py:90
+msgid "Enabled"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:443
+msgid "<b>Email Notifications</b>"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:460
+msgid "Settings"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:495
+msgid ""
+"This configuration does not mean that you'll actually receive notifications "
+"for all these events."
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:513
+msgid "Subscriptions"
+msgstr ""
+
+#: deluge/plugins/notifications/notifications/data/config.glade:594
+msgid "Sound Customization"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/core.py:136
+msgid "Watch folder does not exist."
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/core.py:139
+#: deluge/plugins/autoadd/autoadd/core.py:308
+msgid "Path does not exist."
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:7
+msgid "AutoAdd Error"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:78
+msgid "Watch Folder Properties"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:130
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:306
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:384
+#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:41
+#: deluge/ui/gtkui/glade/main_window.glade:2031
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:373
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:161
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:227
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:287
+msgid "Select A Folder"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:143
+msgid "Enable this watch folder"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:164
+msgid "<b>Watch Folder</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:195
+msgid "Delete .torrent after adding"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:211
+msgid "Append extension after adding:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:228
+msgid ".added"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:248
+msgid "<b>Torrent File Action</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:275
+msgid "Set download location"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:325
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:396
+msgid "<b>Download Location</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:353
+msgid "Set move completed location"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:418
+msgid "<b>Move Completed</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:444
+msgid "Label: "
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:475
+msgid "<b>Label</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:492
+msgid "Main"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:524
+#: deluge/ui/gtkui/glade/main_window.glade:1811
+msgid "Max Upload Speed:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:541
+#: deluge/ui/gtkui/glade/main_window.glade:1798
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:551
+msgid "Max Connections:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:558
+#: deluge/ui/gtkui/glade/main_window.glade:1861
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:565
+msgid "Max Upload Slots:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:638
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:652
+#: deluge/plugins/label/label/data/label_options.glade:132
+#: deluge/plugins/label/label/data/label_options.glade:195
+#: deluge/ui/gtkui/systemtray.py:251 deluge/ui/gtkui/systemtray.py:255
+#: deluge/ui/gtkui/systemtray.py:271 deluge/ui/gtkui/systemtray.py:277
+#: deluge/ui/gtkui/systemtray.py:422 deluge/ui/gtkui/systemtray.py:427
+#: deluge/ui/gtkui/statusbar.py:363 deluge/ui/gtkui/statusbar.py:373
+#: deluge/ui/gtkui/statusbar.py:378 deluge/ui/gtkui/statusbar.py:390
+#: deluge/ui/gtkui/statusbar.py:401 deluge/ui/gtkui/statusbar.py:418
+#: deluge/ui/gtkui/statusbar.py:429 deluge/ui/gtkui/status_tab.py:62
+#: deluge/ui/gtkui/glade/main_window.glade:1834
+#: deluge/ui/gtkui/glade/main_window.glade:1846
+msgid "KiB/s"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:665
+#: deluge/ui/gtkui/glade/main_window.glade:1824
+msgid "Max Download Speed:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:691
+#: deluge/ui/gtkui/glade/main_window.glade:1900
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:634
+msgid "<b>Bandwidth</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:722
+#: deluge/plugins/label/label/data/label_options.glade:349
+#: deluge/ui/gtkui/glade/main_window.glade:1952
+msgid "Stop seed at ratio:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:746
+#: deluge/plugins/label/label/data/label_options.glade:364
+#: deluge/ui/gtkui/glade/main_window.glade:1993
+msgid "Remove at ratio"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:762
+msgid "Auto Managed:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:890
+msgid "Add Paused:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:936
+msgid "Queue to:"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:954
+msgid "Top"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:967
+msgid "Bottom"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1017
+#: deluge/ui/gtkui/glade/main_window.glade:2069
+msgid "<b>Queue</b>"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1037
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:624
+#: deluge/ui/gtkui/glade/connection_manager.glade:457
+msgid "Options"
+msgstr ""
+
+#: deluge/plugins/autoadd/autoadd/data/config.glade:41
+msgid "<b>Watch Folders:</b>"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:238
+msgid "Download Limit:"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:247
+msgid "Upload Limit:"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:256
+msgid "Active Torrents:"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:265
+msgid "Active Downloading:"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:274
+msgid "Active Seeding:"
+msgstr ""
+
+#: deluge/plugins/scheduler/scheduler/gtkui.py:288
+msgid "<b>Slow Settings</b>"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:186
+msgid "Invalid label, valid characters:[a-z0-9_-]"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:187
+msgid "Empty Label"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:188
+msgid "Label already exists"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:196
+#: deluge/plugins/label/label/core.py:276
+#: deluge/plugins/label/label/core.py:311
+msgid "Unknown Label"
+msgstr ""
+
+#: deluge/plugins/label/label/core.py:312
+msgid "Unknown Torrent"
+msgstr ""
+
+#: deluge/plugins/label/label/gtkui/submenu.py:48
+#: deluge/plugins/label/label/gtkui/__init__.py:77
+#: deluge/plugins/label/label/gtkui/__init__.py:111
+#: deluge/plugins/label/label/gtkui/label_config.py:59
+#: deluge/plugins/label/label/gtkui/label_config.py:66
+msgid "Label"
+msgstr ""
+
+#: deluge/plugins/label/label/gtkui/sidebar_menu.py:66
+msgid "Label _Options"
+msgstr ""
+
+#: deluge/plugins/label/label/gtkui/sidebar_menu.py:67
+msgid "_Remove Label"
+msgstr ""
+
+#: deluge/plugins/label/label/gtkui/sidebar_menu.py:68
+msgid "_Add Label"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:7
+msgid "Label Options"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:36
+msgid "<b>Label Options</b>"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:158
+msgid "Upload Slots:\t"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:171
+msgid "Upload Speed:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:184
+msgid "Download Speed:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:226
+msgid "Connections:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:270
+msgid "Apply per torrent max settings:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:283
+msgid "Maximum"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:336
+#: deluge/ui/gtkui/glade/main_window.glade:1930
+msgid "Auto Managed"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:410
+msgid "Apply Queue settings:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:426
+#: deluge/ui/gtkui/preferences.py:76
+msgid "Queue"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:203
+msgid "Move completed to:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:504
+msgid "Apply location settings:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:520
+msgid "Location"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:560
+msgid "<i>(1 line per tracker)</i>"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:576
+msgid "Automatically apply label:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:593
+#: deluge/ui/gtkui/filtertreeview.py:70
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
+msgid "Trackers"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:646
+msgid "Add Label"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:680
+msgid "<b>Add Label</b>"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_options.glade:711
+msgid "Name:"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_pref.glade:22
+msgid "<i>Use the sidebar to add,edit and remove labels. </i>\n"
+msgstr ""
+
+#: deluge/plugins/label/label/data/label_pref.glade:32
+msgid "<b>Labels</b>"
+msgstr ""
+
+#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:27
+msgid "Extract to:"
+msgstr ""
+
+#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:69
+msgid "Create torrent name sub-folder"
+msgstr ""
+
+#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:73
+msgid ""
+"This option will create a sub-folder using the torrent's name within the "
+"selected extract folder and put the extracted files there."
+msgstr ""
+
+#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:87
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:53
+#: deluge/ui/gtkui/glade/main_window.glade:2183
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:705
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2846
+msgid "<b>General</b>"
+msgstr ""
+
+#: deluge/plugins/webui/webui/gtkui.py:97
+msgid ""
+"The Deluge web interface is not installed, please install the\n"
+"interface and try again"
+msgstr ""
+
+#: deluge/plugins/webui/webui/data/config.glade:27
+msgid "Enable web interface"
+msgstr ""
+
+#: deluge/plugins/webui/webui/data/config.glade:41
+msgid "Enable SSL"
+msgstr ""
+
+#: deluge/plugins/webui/webui/data/config.glade:60
+msgid "Listening port:"
+msgstr ""
+
+#: deluge/plugins/webui/webui/data/config.glade:94
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:153
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4172
+msgid "<b>Settings</b>"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:49
+msgid "Emule IP list (GZip)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:50
+msgid "SafePeer Text (Zipped)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:51
+msgid "PeerGuardian Text (Uncompressed)"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/webui.py:52
+msgid "PeerGuardian P2B (GZip)"
+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/plugins/blocklist/blocklist/gtkui.py:67
+#: deluge/plugins/blocklist/blocklist/gtkui.py:155
+#: deluge/plugins/blocklist/blocklist/gtkui.py:186
+msgid "Blocklist"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:27
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:385
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1018
+msgid "URL:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:91
+msgid "Days"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:117
+msgid "Check for new list every:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:133
+msgid "Import blocklist on startup"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:190
+msgid "Download the blocklist file if necessary and import the file."
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:210
+msgid "Check Download and Import"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:232
+msgid "Download a new blocklist file and import it."
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:252
+msgid "Force Download and Import"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:276
+msgid "Blocklist is up to date"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:293
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:471
+msgid "<b>Options</b>"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:397
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3426
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3610
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3794
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3981
+msgid "Type:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:409
+msgid "Date:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:421
+msgid "File Size:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:441
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4821
+msgid "<b>Info</b>"
+msgstr ""
+
+#: deluge/plugins/execute/execute/gtkui.py:51
+msgid "Torrent Complete"
+msgstr ""
+
+#: deluge/plugins/execute/execute/gtkui.py:52
+msgid "Torrent Added"
+msgstr ""
+
+#: deluge/plugins/execute/execute/gtkui.py:77
+#: deluge/plugins/execute/execute/gtkui.py:88
+msgid "Execute"
+msgstr ""
+
+#: deluge/plugins/execute/execute/data/execute_prefs.glade:29
+msgid "Event"
+msgstr ""
+
+#: deluge/plugins/execute/execute/data/execute_prefs.glade:41
+msgid "Command"
+msgstr ""
+
+#: deluge/plugins/execute/execute/data/execute_prefs.glade:112
+msgid "<b>Add Command</b>"
+msgstr ""
+
+#: deluge/plugins/execute/execute/data/execute_prefs.glade:151
+msgid "<b>Commands</b>"
+msgstr ""
+
 #: deluge/core/torrentmanager.py:905
 msgid "Announce OK"
 msgstr ""
@@ -41,8 +728,7 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:939 deluge/ui/gtkui/filtertreeview.py:77
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:32
+#: deluge/core/torrentmanager.py:939 deluge/ui/gtkui/filtertreeview.py:78
 msgid "Error"
 msgstr ""
 
@@ -1030,72 +1716,71 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:197
-msgid ""
-"Deluge\n"
-"Not Connected.."
+#: deluge/ui/web/json_api.py:733 deluge/ui/web/json_api.py:750
+#: deluge/ui/web/json_api.py:759 deluge/ui/web/json_api.py:762
+#: deluge/ui/web/json_api.py:769 deluge/ui/gtkui/connectionmanager.py:75
+#: deluge/ui/gtkui/connectionmanager.py:215
+#: deluge/ui/gtkui/connectionmanager.py:246
+#: deluge/ui/gtkui/connectionmanager.py:283
+#: deluge/ui/gtkui/connectionmanager.py:296
+#: deluge/ui/gtkui/connectionmanager.py:378
+#: deluge/ui/gtkui/connectionmanager.py:389
+#: deluge/ui/gtkui/connectionmanager.py:452
+#: deluge/ui/gtkui/connectionmanager.py:569
+msgid "Offline"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:245 deluge/ui/gtkui/systemtray.py:249
-#: deluge/ui/gtkui/systemtray.py:408 deluge/ui/gtkui/statusbar.py:397
-#: deluge/ui/gtkui/statusbar.py:425 deluge/ui/gtkui/statusbar.py:452
-#: deluge/ui/gtkui/common.py:67
-msgid "Unlimited"
+#: deluge/ui/web/json_api.py:755 deluge/ui/gtkui/connectionmanager.py:76
+#: deluge/ui/gtkui/connectionmanager.py:274
+#: deluge/ui/gtkui/connectionmanager.py:382
+#: deluge/ui/gtkui/connectionmanager.py:552
+msgid "Online"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:247 deluge/ui/gtkui/systemtray.py:251
-#: deluge/ui/gtkui/systemtray.py:267 deluge/ui/gtkui/systemtray.py:273
-#: deluge/ui/gtkui/systemtray.py:407 deluge/ui/gtkui/systemtray.py:412
-#: deluge/ui/gtkui/status_tab.py:62 deluge/ui/gtkui/statusbar.py:363
-#: deluge/ui/gtkui/statusbar.py:373 deluge/ui/gtkui/statusbar.py:378
-#: deluge/ui/gtkui/statusbar.py:390 deluge/ui/gtkui/statusbar.py:401
-#: deluge/ui/gtkui/statusbar.py:418 deluge/ui/gtkui/statusbar.py:429
-#: deluge/ui/gtkui/glade/main_window.glade:1828
-#: deluge/ui/gtkui/glade/main_window.glade:1840
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:638
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:652
-#: deluge/plugins/label/label/data/label_options.glade:132
-#: deluge/plugins/label/label/data/label_options.glade:195
-msgid "KiB/s"
+#: deluge/ui/web/json_api.py:775 deluge/ui/gtkui/connectionmanager.py:77
+#: deluge/ui/gtkui/connectionmanager.py:313
+#: deluge/ui/gtkui/connectionmanager.py:372
+#: deluge/ui/gtkui/connectionmanager.py:382
+#: deluge/ui/gtkui/connectionmanager.py:440
+#: deluge/ui/gtkui/connectionmanager.py:552
+msgid "Connected"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:254
-msgid "Deluge"
+#: deluge/ui/web/json_api.py:802
+msgid "Daemon doesn't exist"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:254
-msgid "Down"
+#: deluge/ui/web/json_api.py:808
+msgid "Daemon not running"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:255
-msgid "Up"
+#: deluge/ui/web/server.py:661
+msgid "Starting server in PID"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:388 deluge/ui/gtkui/statusbar.py:401
-#: deluge/ui/gtkui/menubar.py:424
-msgid "Set Maximum Download Speed"
+#: deluge/ui/gtkui/peers_tab.py:100
+msgid "Address"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:402 deluge/ui/gtkui/statusbar.py:429
-#: deluge/ui/gtkui/menubar.py:425
-msgid "Set Maximum Upload Speed"
+#: deluge/ui/gtkui/peers_tab.py:116
+msgid "Client"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:411 deluge/ui/gtkui/statusbar.py:399
-#: deluge/ui/gtkui/statusbar.py:427 deluge/ui/gtkui/statusbar.py:454
-#: deluge/ui/gtkui/common.py:124 deluge/ui/gtkui/common.py:125
-msgid "Other..."
+#: deluge/ui/gtkui/peers_tab.py:129 deluge/ui/gtkui/files_tab.py:156
+#: deluge/ui/gtkui/torrentview.py:225 deluge/ui/gtkui/torrentview.py:546
+msgid "Progress"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:455
-msgid "<b><big>Deluge is password protected!</big></b>"
+#: deluge/ui/gtkui/peers_tab.py:142 deluge/ui/gtkui/torrentview.py:237
+msgid "Down Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:461
-msgid "<i>Enter your password to continue</i>"
+#: deluge/ui/gtkui/peers_tab.py:155 deluge/ui/gtkui/torrentview.py:239
+msgid "Up Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/queuedtorrents.py:75 deluge/ui/gtkui/addtorrentdialog.py:99
+#: deluge/ui/gtkui/queuedtorrents.py:75
+#: deluge/ui/gtkui/addtorrentdialog.py:103
 msgid "Torrent"
 msgstr ""
 
@@ -1107,105 +1792,64 @@ msgstr ""
 msgid " Torrent Queued"
 msgstr ""
 
-#: deluge/ui/gtkui/aboutdialog.py:67
-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>. In addition, as a special exception, the copyright holders "
-"give permission to link the code of portions of this program with the "
-"OpenSSL library. You must obey the GNU General Public License in all "
-"respects for all of the code used other than OpenSSL. If you modify file(s) "
-"with this exception, you may extend this exception to your version of the "
-"file(s), but you are not obligated to do so. If you do not wish to do so, "
-"delete this exception statement from your version. If you delete this "
-"exception statement from all source files in the program, then also delete "
-"it here."
+#: deluge/ui/gtkui/common.py:67 deluge/ui/gtkui/systemtray.py:249
+#: deluge/ui/gtkui/systemtray.py:253 deluge/ui/gtkui/systemtray.py:423
+#: deluge/ui/gtkui/statusbar.py:397 deluge/ui/gtkui/statusbar.py:425
+#: deluge/ui/gtkui/statusbar.py:452
+msgid "Unlimited"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:56
-msgid "Do Not Download"
+#: deluge/ui/gtkui/common.py:70
+msgid "Activated"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:57
-msgid "Normal Priority"
+#: deluge/ui/gtkui/common.py:124 deluge/ui/gtkui/common.py:125
+#: deluge/ui/gtkui/systemtray.py:426 deluge/ui/gtkui/statusbar.py:399
+#: deluge/ui/gtkui/statusbar.py:427 deluge/ui/gtkui/statusbar.py:454
+#: deluge/ui/gtkui/menubar.py:81
+msgid "Other..."
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:58
-msgid "High Priority"
+#: deluge/ui/gtkui/mainwindow.py:235
+msgid "Down:"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:59
-msgid "Highest Priority"
+#: deluge/ui/gtkui/mainwindow.py:235
+msgid "Up:"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:122 deluge/ui/gtkui/addtorrentdialog.py:107
-#: deluge/ui/gtkui/createtorrentdialog.py:80
-msgid "Filename"
+#: deluge/ui/gtkui/systemtray.py:201 deluge/ui/gtkui/systemtray.py:258
+msgid "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:142 deluge/ui/gtkui/addtorrentdialog.py:120
-#: deluge/ui/gtkui/createtorrentdialog.py:90
-#: deluge/ui/gtkui/torrentview.py:208
-msgid "Size"
+#: deluge/ui/gtkui/systemtray.py:201
+msgid "Not Connected..."
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:155 deluge/ui/gtkui/peers_tab.py:129
-#: deluge/ui/gtkui/torrentview.py:217 deluge/ui/gtkui/torrentview.py:532
-msgid "Progress"
+#: deluge/ui/gtkui/systemtray.py:258
+msgid "Down"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:168
-msgid "Priority"
+#: deluge/ui/gtkui/systemtray.py:259
+msgid "Up"
 msgstr ""
 
-#: deluge/ui/gtkui/dialogs.py:174
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4709
-msgid "Details:"
+#: deluge/ui/gtkui/systemtray.py:403 deluge/ui/gtkui/statusbar.py:401
+#: deluge/ui/gtkui/menubar.py:436
+msgid "Set Maximum Download Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/gtkui.py:297 deluge/ui/gtkui/gtkui.py:312
-msgid "Turn off Classic Mode?"
+#: deluge/ui/gtkui/systemtray.py:417 deluge/ui/gtkui/statusbar.py:429
+#: deluge/ui/gtkui/menubar.py:437
+msgid "Set Maximum Upload Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/gtkui.py:298
-msgid ""
-"It appears that a Deluge daemon process (deluged) is already running.\n"
-"\n"
-"You will either need to stop the daemon or turn off Classic Mode to continue."
+#: deluge/ui/gtkui/systemtray.py:470
+msgid "Deluge is password protected!"
 msgstr ""
 
-#: deluge/ui/gtkui/gtkui.py:307
-msgid "Error Starting Core"
-msgstr ""
-
-#: deluge/ui/gtkui/gtkui.py:308
-msgid ""
-"There was an error starting the core component which is required to run "
-"Deluge in Classic Mode.\n"
-"\n"
-"Please see the details below for more information."
-msgstr ""
-
-#: deluge/ui/gtkui/gtkui.py:313
-msgid ""
-"Since there was an error starting in Classic Mode would you like to continue "
-"by turning it off?"
-msgstr ""
-
-#: deluge/ui/gtkui/gtkui.py:337
-msgid "Error Starting Daemon"
-msgstr ""
-
-#: deluge/ui/gtkui/gtkui.py:338
-msgid ""
-"There was an error starting the daemon process.  Try running it from a "
-"console to see if there is an error."
+#: deluge/ui/gtkui/systemtray.py:476
+msgid "Enter your password to continue"
 msgstr ""
 
 #: deluge/ui/gtkui/notification.py:79
@@ -1213,8 +1857,11 @@ msgid "Torrent complete"
 msgstr ""
 
 #: deluge/ui/gtkui/notification.py:80
-#, python-format
-msgid "Including %i files"
+msgid "Including"
+msgstr ""
+
+#: deluge/ui/gtkui/notification.py:80
+msgid "files"
 msgstr ""
 
 #: deluge/ui/gtkui/notification.py:109
@@ -1229,133 +1876,147 @@ msgid ""
 "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/status_tab.py:128 deluge/ui/gtkui/menubar.py:89
-msgid "On"
+#: deluge/ui/gtkui/preferences.py:71
+msgid "Categories"
 msgstr ""
 
-#: deluge/ui/gtkui/status_tab.py:130 deluge/ui/gtkui/menubar.py:92
-msgid "Off"
+#: deluge/ui/gtkui/preferences.py:75
+msgid "Downloads"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:202
+#: deluge/ui/gtkui/preferences.py:75
+msgid "Network"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:75
+msgid "Bandwidth"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:76
+msgid "Interface"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:76
+msgid "Other"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:76
+msgid "Daemon"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:76
+msgid "Proxy"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:77
+msgid "Cache"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:77
+msgid "Plugins"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:92
+msgid "Plugin"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:879
+msgid "Select the Plugin"
+msgstr ""
+
+#: deluge/ui/gtkui/preferences.py:890
+msgid "Plugin Eggs"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:111
+#: deluge/ui/gtkui/createtorrentdialog.py:80 deluge/ui/gtkui/files_tab.py:122
+msgid "Filename"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:124
+#: deluge/ui/gtkui/createtorrentdialog.py:90 deluge/ui/gtkui/files_tab.py:143
+#: deluge/ui/gtkui/torrentview.py:216
+msgid "Size"
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:206
 msgid "Invalid File"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:207
+#: deluge/ui/gtkui/addtorrentdialog.py:211
 msgid "Duplicate Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:207
+#: deluge/ui/gtkui/addtorrentdialog.py:211
 msgid "You cannot add the same torrent twice."
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:488
+#: deluge/ui/gtkui/addtorrentdialog.py:492
 msgid "Unable to set file priority!"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:488
+#: deluge/ui/gtkui/addtorrentdialog.py:492
 msgid ""
 "File prioritization is unavailable when using Compact allocation.  Would you "
 "like to switch to Full allocation?"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:537
+#: deluge/ui/gtkui/addtorrentdialog.py:541
 msgid "Choose a .torrent file"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:549
+#: deluge/ui/gtkui/addtorrentdialog.py:553
 #: deluge/ui/gtkui/createtorrentdialog.py:253
 msgid "Torrent files"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:553
+#: deluge/ui/gtkui/addtorrentdialog.py:557
 #: deluge/ui/gtkui/createtorrentdialog.py:257
 msgid "All files"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:618
+#: deluge/ui/gtkui/addtorrentdialog.py:622
 msgid "Invalid URL"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:618
-#, python-format
-msgid "%s is not a valid URL."
-msgstr ""
-
 #: deluge/ui/gtkui/addtorrentdialog.py:622
-msgid "Downloading.."
+msgid "is not a valid URL."
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:656
+#: deluge/ui/gtkui/addtorrentdialog.py:626
+msgid "Downloading..."
+msgstr ""
+
+#: deluge/ui/gtkui/addtorrentdialog.py:668
 msgid "Download Failed"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:656
-#, python-format
-msgid "Failed to download : %s"
+#: deluge/ui/gtkui/addtorrentdialog.py:668
+msgid "Failed to download:"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:68
-msgid "States"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:69
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
-#: deluge/plugins/label/label/data/label_options.glade:596
-msgid "Trackers"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:70
-msgid "Labels"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:71
-msgid "All"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:72
-msgid "Downloading"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:73
-msgid "Seeding"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:74
-msgid "Paused"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:75
-msgid "Checking"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:76
-msgid "Queued"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:78
-msgid "Active"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:79
-msgid "None"
-msgstr ""
-
-#: deluge/ui/gtkui/filtertreeview.py:80
-msgid "No Label"
-msgstr ""
-
-#: deluge/ui/gtkui/edittrackersdialog.py:84
 #: deluge/ui/gtkui/createtorrentdialog.py:103
+#: deluge/ui/gtkui/edittrackersdialog.py:84
 msgid "Tier"
 msgstr ""
 
-#: deluge/ui/gtkui/edittrackersdialog.py:86
 #: deluge/ui/gtkui/createtorrentdialog.py:105
-#: deluge/ui/gtkui/torrentview.py:239
+#: deluge/ui/gtkui/edittrackersdialog.py:86 deluge/ui/gtkui/torrentview.py:253
 msgid "Tracker"
 msgstr ""
 
+#: deluge/ui/gtkui/createtorrentdialog.py:143
+msgid "Choose a file"
+msgstr ""
+
+#: deluge/ui/gtkui/createtorrentdialog.py:172
+msgid "Choose a folder"
+msgstr ""
+
+#: deluge/ui/gtkui/createtorrentdialog.py:241
+msgid "Save .torrent file"
+msgstr ""
+
 #: deluge/ui/gtkui/statusbar.py:146
 msgid "Not Connected"
 msgstr ""
@@ -1388,7 +2049,7 @@ msgstr ""
 msgid "No Incoming Connections!"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:456 deluge/ui/gtkui/menubar.py:426
+#: deluge/ui/gtkui/statusbar.py:456 deluge/ui/gtkui/menubar.py:438
 msgid "Set Maximum Connections"
 msgstr ""
 
@@ -1396,70 +2057,75 @@ msgstr ""
 msgid "Torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:100
-msgid "Address"
+#: deluge/ui/gtkui/filtertreeview.py:69
+msgid "States"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:116
-msgid "Client"
+#: deluge/ui/gtkui/filtertreeview.py:71
+msgid "Labels"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:142 deluge/ui/gtkui/torrentview.py:227
-msgid "Down Speed"
+#: deluge/ui/gtkui/filtertreeview.py:72
+msgid "All"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:155 deluge/ui/gtkui/torrentview.py:229
-msgid "Up Speed"
+#: deluge/ui/gtkui/filtertreeview.py:73
+msgid "Downloading"
 msgstr ""
 
-#: deluge/ui/gtkui/common.py:70
-msgid "Activated"
+#: deluge/ui/gtkui/filtertreeview.py:74
+msgid "Seeding"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:77
-msgid "Set Unlimited"
+#: deluge/ui/gtkui/filtertreeview.py:75
+msgid "Paused"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:81
-msgid "Other.."
+#: deluge/ui/gtkui/filtertreeview.py:76
+msgid "Checking"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:319
-msgid "Choose a directory to move files to"
+#: deluge/ui/gtkui/filtertreeview.py:77
+msgid "Queued"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:427
-msgid "Set Maximum Upload Slots"
+#: deluge/ui/gtkui/filtertreeview.py:79
+msgid "Active"
 msgstr ""
 
-#: deluge/ui/gtkui/connectionmanager.py:75
-#: deluge/ui/gtkui/connectionmanager.py:215
-#: deluge/ui/gtkui/connectionmanager.py:246
-#: deluge/ui/gtkui/connectionmanager.py:283
-#: deluge/ui/gtkui/connectionmanager.py:296
-#: deluge/ui/gtkui/connectionmanager.py:378
-#: deluge/ui/gtkui/connectionmanager.py:389
-#: deluge/ui/gtkui/connectionmanager.py:452
-#: deluge/ui/gtkui/connectionmanager.py:569 deluge/ui/web/json_api.py:710
-#: deluge/ui/web/json_api.py:734 deluge/ui/web/json_api.py:737
-#: deluge/ui/web/json_api.py:745
-msgid "Offline"
+#: deluge/ui/gtkui/filtertreeview.py:80
+msgid "None"
 msgstr ""
 
-#: deluge/ui/gtkui/connectionmanager.py:76
-#: deluge/ui/gtkui/connectionmanager.py:274
-#: deluge/ui/gtkui/connectionmanager.py:382
-#: deluge/ui/gtkui/connectionmanager.py:552 deluge/ui/web/json_api.py:730
-msgid "Online"
+#: deluge/ui/gtkui/filtertreeview.py:81
+msgid "No Label"
 msgstr ""
 
-#: deluge/ui/gtkui/connectionmanager.py:77
-#: deluge/ui/gtkui/connectionmanager.py:313
-#: deluge/ui/gtkui/connectionmanager.py:372
-#: deluge/ui/gtkui/connectionmanager.py:382
-#: deluge/ui/gtkui/connectionmanager.py:440
-#: deluge/ui/gtkui/connectionmanager.py:552 deluge/ui/web/json_api.py:751
-msgid "Connected"
+#: deluge/ui/gtkui/aboutdialog.py:253
+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. \n"
+"\n"
+"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. \n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, see <http://www.gnu.org/licenses>. \n"
+"\n"
+"In addition, as a special exception, the copyright holders give permission "
+"to link the code of portions of this program with the OpenSSL library. You "
+"must obey the GNU General Public License in all respects for all of the code "
+"used other than OpenSSL. \n"
+"\n"
+"If you modify file(s) with this exception, you may extend this exception to "
+"your version of the file(s), but you are not obligated to do so. If you do "
+"not wish to do so, delete this exception statement from your version. If you "
+"delete this exception statement from all source files in the program, then "
+"also delete it here."
 msgstr ""
 
 #: deluge/ui/gtkui/connectionmanager.py:149
@@ -1501,133 +2167,596 @@ msgstr ""
 msgid "Error Adding Host"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:143
-msgid "Choose a file"
+#: deluge/ui/gtkui/gtkui.py:300 deluge/ui/gtkui/gtkui.py:315
+msgid "Turn off Classic Mode?"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:172
-msgid "Choose a folder"
+#: deluge/ui/gtkui/gtkui.py:301
+msgid ""
+"It appears that a Deluge daemon process (deluged) is already running.\n"
+"\n"
+"You will either need to stop the daemon or turn off Classic Mode to continue."
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:241
-msgid "Save .torrent file"
+#: deluge/ui/gtkui/gtkui.py:310
+msgid "Error Starting Core"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:373
-#, python-format
-msgid "%.2f%%"
+#: deluge/ui/gtkui/gtkui.py:311
+msgid ""
+"There was an error starting the core component which is required to run "
+"Deluge in Classic Mode.\n"
+"\n"
+"Please see the details below for more information."
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:71
-msgid "Categories"
+#: deluge/ui/gtkui/gtkui.py:316
+msgid ""
+"Since there was an error starting in Classic Mode would you like to continue "
+"by turning it off?"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:75 deluge/ui/gtkui/preferences_old.py:75
-msgid "Downloads"
+#: deluge/ui/gtkui/gtkui.py:340
+msgid "Error Starting Daemon"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:75 deluge/ui/gtkui/preferences_old.py:75
-msgid "Network"
+#: deluge/ui/gtkui/gtkui.py:341
+msgid ""
+"There was an error starting the daemon process.  Try running it from a "
+"console to see if there is an error."
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:75 deluge/ui/gtkui/preferences_old.py:75
-msgid "Bandwidth"
+#: deluge/ui/gtkui/status_tab.py:128 deluge/ui/gtkui/menubar.py:89
+msgid "On"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:76 deluge/ui/gtkui/preferences_old.py:76
-msgid "Interface"
+#: deluge/ui/gtkui/status_tab.py:130 deluge/ui/gtkui/menubar.py:92
+msgid "Off"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:76 deluge/ui/gtkui/preferences_old.py:76
-msgid "Other"
+#: deluge/ui/gtkui/menubar.py:77
+msgid "Set Unlimited"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:76 deluge/ui/gtkui/preferences_old.py:76
-msgid "Daemon"
+#: deluge/ui/gtkui/menubar.py:319
+msgid "Choose a directory to move files to"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:76 deluge/ui/gtkui/preferences_old.py:76
-#: deluge/plugins/label/label/data/label_options.glade:426
-msgid "Queue"
+#: deluge/ui/gtkui/menubar.py:439
+msgid "Set Maximum Upload Slots"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:76 deluge/ui/gtkui/preferences_old.py:76
-msgid "Proxy"
+#: deluge/ui/gtkui/files_tab.py:56
+msgid "Do Not Download"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:77 deluge/ui/gtkui/preferences_old.py:77
-msgid "Cache"
+#: deluge/ui/gtkui/files_tab.py:57
+msgid "Normal Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:77 deluge/ui/gtkui/preferences_old.py:77
-msgid "Plugins"
+#: deluge/ui/gtkui/files_tab.py:58
+msgid "High Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:90 deluge/ui/gtkui/preferences_old.py:90
-#: deluge/plugins/notifications/notifications/data/config.glade:420
-msgid "Enabled"
+#: deluge/ui/gtkui/files_tab.py:59
+msgid "Highest Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:92 deluge/ui/gtkui/preferences_old.py:92
-msgid "Plugin"
+#: deluge/ui/gtkui/files_tab.py:169
+msgid "Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:874 deluge/ui/gtkui/preferences_old.py:870
-msgid "Select the Plugin"
+#: deluge/ui/gtkui/dialogs.py:174
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4729
+msgid "Details:"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:885 deluge/ui/gtkui/preferences_old.py:881
-msgid "Plugin Eggs"
-msgstr ""
-
-#: deluge/ui/gtkui/mainwindow.py:238
-msgid "Down:"
-msgstr ""
-
-#: deluge/ui/gtkui/mainwindow.py:238
-msgid "Up:"
-msgstr ""
-
-#: deluge/ui/gtkui/torrentview.py:205
+#: deluge/ui/gtkui/torrentview.py:213
 msgid "Name"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:211
+#: deluge/ui/gtkui/torrentview.py:219
 msgid "Downloaded"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:214
+#: deluge/ui/gtkui/torrentview.py:222
 msgid "Uploaded"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:221
+#: deluge/ui/gtkui/torrentview.py:229 deluge/ui/gtkui/torrentview.py:235
 msgid "Seeders"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:224
+#: deluge/ui/gtkui/torrentview.py:232 deluge/ui/gtkui/torrentview.py:235
 msgid "Peers"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:231
-msgid "ETA"
-msgstr ""
-
-#: deluge/ui/gtkui/torrentview.py:233
-msgid "Ratio"
-msgstr ""
-
-#: deluge/ui/gtkui/torrentview.py:235
-msgid "Avail"
-msgstr ""
-
-#: deluge/ui/gtkui/torrentview.py:237
-msgid "Added"
+#: deluge/ui/gtkui/torrentview.py:241
+msgid "Down Limit"
 msgstr ""
 
 #: deluge/ui/gtkui/torrentview.py:243
+msgid "Up Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:245
+msgid "ETA"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:247
+msgid "Ratio"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:249
+msgid "Avail"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:251
+msgid "Added"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:257
 msgid "Save Path"
 msgstr ""
 
+#: deluge/ui/gtkui/glade/main_window.glade:21
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:99
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:122
+msgid "_File"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:27
+#: deluge/ui/gtkui/glade/tray_menu.glade:26
+msgid "_Add Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:45
+msgid "_Create Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:65
+msgid "Quit & _Shutdown Daemon"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:101
+msgid "_Edit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:118
+msgid "_Connection Manager"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:140
+msgid "_Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:147
+msgid "_View"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:155
+msgid "_Toolbar"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:165
+msgid "_Sidebar"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:174
+msgid "Status_bar"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:188
+msgid "T_abs"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:195
+msgid "_Columns"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:203
+msgid "S_idebar"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:212
+msgid "Show _Zero Hits"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:221
+msgid "Show _Trackers"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:238
+msgid "_Help"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:244
+msgid "_Homepage"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:261
+msgid "_FAQ"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:264
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:280
+msgid "_Community"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:327
+msgid "Add torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:328
+msgid "Add Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:342
+msgid "Remove torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:343
+msgid "Remove Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:364
+msgid "Pause the selected torrents"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:365
+msgid "Pause"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:380
+msgid "Resume the selected torrents"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:381
+msgid "Resume"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:403
+msgid "Queue Torrent Up"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:404
+msgid "Queue Up"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:418
+msgid "Queue Torrent Down"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:419
+msgid "Queue Down"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:440
+#: deluge/ui/gtkui/glade/main_window.glade:441
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:8
+msgid "Preferences"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:455
+#: deluge/ui/gtkui/glade/main_window.glade:456
+#: deluge/ui/gtkui/glade/connection_manager.glade:204
+msgid "Connection Manager"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:570
+msgid "_Expand All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:591
+msgid "_Do Not Download"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:607
+msgid "_Normal Priority"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:623
+msgid "_High Priority"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:639
+msgid "Hi_ghest Priority"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:721
+msgid "<b>Auto Managed:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:762
+msgid "<b>Seed Rank:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:777
+msgid "<b>Seeding Time:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:803
+msgid "<b>Active Time:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:860
+msgid "<b>Tracker Status:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:890
+msgid "<b>Availability:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:944
+msgid "<b>Peers:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:970
+msgid "<b>Seeders:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:988
+msgid "<b>Pieces:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1010
+msgid "<b>ETA:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1032
+#: deluge/ui/gtkui/glade/main_window.glade:1054
+msgid "<b>Speed:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1073
+msgid "<b>Next Announce:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1092
+msgid "<b>Share Ratio:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1111
+msgid "<b>Uploaded:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1130
+msgid "<b>Downloaded:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1191
+msgid "<b>Date Added:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1249
+msgid "_Status"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1310
+msgid "<b>Comments:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1339
+msgid "<b># of files:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1371
+msgid "<b>Hash:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1401
+msgid "<b>Tracker:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1421
+msgid "<b>Total Size:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1459
+msgid "<b>Name:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1479
+msgid "<b>Path:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1513
+msgid "<b>Status:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1594
+msgid "_Details"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1646
+msgid "_Files"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1698
+msgid "_Peers"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2009
+msgid "Move completed:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2105
+msgid "Private"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2120
+msgid "Prioritize First/Last"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2158
+#: deluge/ui/gtkui/glade/torrent_menu.glade:130
+msgid "_Edit Trackers"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2265
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:867
+msgid "_Options"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2285
+msgid "Remove Torrent?"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2324
+msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2376
+msgid "<i>The associated .torrent will be deleted!</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2416
+msgid "<i>The downloaded data will be deleted!</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2460
+msgid "Remove Selected Torrent"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2484
+msgid "New Release"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2518
+msgid "<b><big>New Release Available!</big></b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2570
+msgid "<i>Available Version:</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2593
+msgid "<i>Current Version:</i>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2613
+msgid "Do not show this dialog in the future"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2652
+msgid "_Goto Website"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2680
+msgid "_Add Peer"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:2682
+msgid "Add a peer by its IP"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/filtertree_menu.glade:10
+msgid "_Select All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/filtertree_menu.glade:26
+#: deluge/ui/gtkui/glade/tray_menu.glade:48
+msgid "_Pause All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/filtertree_menu.glade:41
+#: deluge/ui/gtkui/glade/torrent_menu.glade:48
+msgid "Resume selected torrents."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/filtertree_menu.glade:42
+msgid "Resu_me All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:8
+msgid "Add Torrents"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:147
+msgid "_URL"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:195
+msgid "Info_hash"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:241
+msgid "_Remove"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:274
+msgid "<b>Torrents</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:331
+msgid "Fi_les"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:434
+msgid "Full"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:450
+msgid "Compact"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:472
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:408
+msgid "<b>Allocation</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:525
+msgid "Max Down Speed:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:537
+msgid "Max Up Speed:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:668
+msgid "Add In _Paused State"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:684
+msgid "Prioritize First/Last Pieces"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:762
+msgid "Revert To Defaults"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:816
+msgid "Apply To All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:944
+msgid "Add URL"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:983
+msgid "<b>From URL</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1104
+msgid "Add Infohash"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1143
+msgid "<b>From Infohash</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1178
+msgid "Infohash:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1214
+#: deluge/ui/gtkui/glade/edit_trackers.glade:296
+msgid "Trackers:"
+msgstr ""
+
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:7
 msgid "Create Torrent"
 msgstr ""
@@ -1636,12 +2765,6 @@ msgstr ""
 msgid "<big><b>Create Torrent</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:122
-#: deluge/ui/gtkui/glade/main_window.glade:21
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:99
-msgid "_File"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:159
 msgid "Fol_der"
 msgstr ""
@@ -1655,7 +2778,7 @@ msgid "<b>Files</b>"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:263
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4735
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4755
 msgid "Author:"
 msgstr ""
 
@@ -1686,66 +2809,54 @@ msgid ""
 "2 MiB\n"
 "4 MiB\n"
 "8 MiB\n"
+"16 MiB\n"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:579
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:580
 msgid "Set Private Flag"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:593
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:594
 msgid "Add this torrent to the session"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:623
-#: deluge/ui/gtkui/glade/connection_manager.glade:457
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1037
-msgid "Options"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:691
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:692
 msgid "Enter Remote Path"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:727
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:728
 msgid "<b>Remote Path</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:761
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:943
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:762
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:944
 msgid "Path:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:836
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:837
 msgid "Creating Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:873
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:874
 msgid "Save .torrent as"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:909
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:910
 msgid "<b>Save .torrent file</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/filtertree_menu.glade:10
-msgid "_Select All"
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:8
+msgid "Queued Torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/filtertree_menu.glade:26
-#: deluge/ui/gtkui/glade/tray_menu.glade:48
-msgid "_Pause All"
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:47
+msgid "<big><b>Add Queued Torrents</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/filtertree_menu.glade:41
-#: deluge/ui/gtkui/glade/torrent_menu.glade:48
-msgid "Resume selected torrents."
+#: deluge/ui/gtkui/glade/queuedtorrents.glade:127
+msgid "Automatically add torrents on connect"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/filtertree_menu.glade:42
-msgid "Resu_me All"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/dgtkpopups.glade:37
 #: deluge/ui/gtkui/glade/dgtkpopups.glade:98
 msgid "label"
 msgstr ""
@@ -1762,504 +2873,28 @@ msgstr ""
 msgid "hostname:port"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:11
-msgid "_Open Folder"
+#: deluge/ui/gtkui/glade/connection_manager.glade:8
+msgid "Add Host"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:49
-msgid "Resu_me"
+#: deluge/ui/gtkui/glade/connection_manager.glade:237
+msgid "<big><b>Connection Manager</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:71
-msgid "Opt_ions"
+#: deluge/ui/gtkui/glade/connection_manager.glade:363
+msgid "_Start local daemon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:93
-msgid "_Queue"
+#: deluge/ui/gtkui/glade/connection_manager.glade:415
+msgid "Automatically connect to selected host on start-up"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:113
-msgid "_Update Tracker"
+#: deluge/ui/gtkui/glade/connection_manager.glade:426
+msgid "Automatically start localhost if needed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/torrent_menu.glade:130
-#: deluge/ui/gtkui/glade/main_window.glade:2152
-msgid "_Edit Trackers"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:152
-msgid "_Remove Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:174
-msgid "_Force Re-check"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:191
-msgid "Move _Storage"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:212
-#: deluge/ui/gtkui/glade/tray_menu.glade:87
-msgid "_Download Speed Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:227
-#: deluge/ui/gtkui/glade/tray_menu.glade:103
-msgid "_Upload Speed Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:242
-msgid "_Connection Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:258
-msgid "Upload _Slot Limit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/torrent_menu.glade:273
-msgid "_Auto Managed"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:27
-#: deluge/ui/gtkui/glade/tray_menu.glade:26
-msgid "_Add Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:44
-msgid "_Create Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:63
-msgid "Quit & _Shutdown Daemon"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:98
-msgid "_Edit"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:114
-msgid "_Connection Manager"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:135
-msgid "_Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:142
-msgid "_View"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:150
-msgid "_Toolbar"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:160
-msgid "_Sidebar"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:169
-msgid "Status_bar"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:183
-msgid "T_abs"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:190
-msgid "_Columns"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:198
-msgid "S_idebar"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:207
-msgid "Show _Zero Hits"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:216
-msgid "Show _Trackers"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:233
-msgid "_Help"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:239
-msgid "_Homepage"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:256
-msgid "_FAQ"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:259
-msgid "Frequently Asked Questions"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:274
-msgid "_Community"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:321
-msgid "Add torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:322
-msgid "Add Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:336
-msgid "Remove torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:337
-msgid "Remove Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:358
-msgid "Pause the selected torrents"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:359
-msgid "Pause"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:374
-msgid "Resume the selected torrents"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:375
-msgid "Resume"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:397
-msgid "Queue Torrent Up"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:398
-msgid "Queue Up"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:412
-msgid "Queue Torrent Down"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:413
-msgid "Queue Down"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:434
-#: deluge/ui/gtkui/glade/main_window.glade:435
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:8
-msgid "Preferences"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:449
-#: deluge/ui/gtkui/glade/main_window.glade:450
-#: deluge/ui/gtkui/glade/connection_manager.glade:204
-msgid "Connection Manager"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:564
-msgid "_Expand All"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:585
-msgid "_Do Not Download"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:601
-msgid "_Normal Priority"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:617
-msgid "_High Priority"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:633
-msgid "Hi_ghest Priority"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:715
-msgid "<b>Auto Managed:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:756
-msgid "<b>Seed Rank:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:771
-msgid "<b>Seeding Time:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:797
-msgid "<b>Active Time:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:854
-msgid "<b>Tracker Status:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:884
-msgid "<b>Availability:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:938
-msgid "<b>Peers:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:964
-msgid "<b>Seeders:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:982
-msgid "<b>Pieces:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1004
-msgid "<b>ETA:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1026
-#: deluge/ui/gtkui/glade/main_window.glade:1048
-msgid "<b>Speed:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1067
-msgid "<b>Next Announce:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1086
-msgid "<b>Share Ratio:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1105
-msgid "<b>Uploaded:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1124
-msgid "<b>Downloaded:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1185
-msgid "<b>Date Added:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1243
-msgid "_Status"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1304
-msgid "<b>Comments:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1333
-msgid "<b># of files:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1365
-msgid "<b>Hash:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1395
-msgid "<b>Tracker:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1415
-msgid "<b>Total Size:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1453
-msgid "<b>Name:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1473
-msgid "<b>Path:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1507
-msgid "<b>Status:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1588
-msgid "_Details"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1640
-msgid "_Files"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1692
-msgid "_Peers"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1792
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:551
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:541
-msgid "Max Connections:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1805
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:524
-msgid "Max Upload Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1818
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:665
-msgid "Max Download Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1855
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:565
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:558
-msgid "Max Upload Slots:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1894
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:634
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:691
-msgid "<b>Bandwidth</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1924
-#: deluge/plugins/label/label/data/label_options.glade:336
-msgid "Auto Managed"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1946
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:722
-#: deluge/plugins/label/label/data/label_options.glade:349
-msgid "Stop seed at ratio:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:1987
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:746
-#: deluge/plugins/label/label/data/label_options.glade:364
-msgid "Remove at ratio"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2003
-msgid "Move completed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2025
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:161
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:227
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:287
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:373
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:130
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:306
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:384
-#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:41
-msgid "Select A Folder"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2063
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1017
-msgid "<b>Queue</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2099
-msgid "Private"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2114
-msgid "Prioritize First/Last"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2177
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2826
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:705
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:53
-#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:87
-msgid "<b>General</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2259
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:867
-msgid "_Options"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2279
-msgid "Remove Torrent?"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2318
-msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2370
-msgid "<i>The associated .torrent will be deleted!</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2410
-msgid "<i>The downloaded data will be deleted!</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2454
-msgid "Remove Selected Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2478
-msgid "New Release"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2512
-msgid "<b><big>New Release Available!</big></b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2564
-msgid "<i>Available Version:</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2587
-msgid "<i>Current Version:</i>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2607
-msgid "Do not show this dialog in the future"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2646
-msgid "_Goto Website"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2674
-msgid "_Add Peer"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:2676
-msgid "Add a peer by its IP"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:45
-msgid "<big><b>Remove the selected torrent?</b></big>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:57
-msgid "If you remove the data, it will be lost permanently."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:117
-msgid "Remove With _Data"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:155
-msgid "Remove _Torrent"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/tray_menu.glade:12
-msgid "_Show Deluge"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/tray_menu.glade:65
-msgid "_Resume All"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/tray_menu.glade:124
-msgid "Quit & Shutdown Daemon"
+#: deluge/ui/gtkui/glade/connection_manager.glade:440
+msgid "Do not show this dialog on start-up"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:77
@@ -2270,11 +2905,6 @@ msgstr ""
 msgid "Auto add .torrents from:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:203
-#: deluge/plugins/label/label/data/label_options.glade:453
-msgid "Move completed to:"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:252
 msgid "Download to:"
 msgstr ""
@@ -2313,11 +2943,6 @@ msgstr ""
 msgid "Compact allocation only allocates space as needed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:408
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:472
-msgid "<b>Allocation</b>"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:439
 msgid "Prioritize first and last pieces of torrent"
 msgstr ""
@@ -2330,15 +2955,6 @@ msgstr ""
 msgid "Add torrents in Paused state"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:471
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:293
-msgid "<b>Options</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:496
-msgid "page 6"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:528
 msgid "<b><i><big>Network</big></i></b>"
 msgstr ""
@@ -2356,16 +2972,6 @@ msgstr ""
 msgid "Active Port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:604
-msgid "0000"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:632
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:782
-#: deluge/plugins/notifications/notifications/data/config.glade:397
-msgid "From:"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:661
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:811
 msgid "To:"
@@ -2403,10 +3009,6 @@ msgstr ""
 msgid "Peer TOS Byte:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:952
-msgid "0x00"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:972
 msgid "<b>TOS</b>"
 msgstr ""
@@ -2487,10 +3089,6 @@ msgstr ""
 msgid "<b>Encryption</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1285
-msgid "page 7"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1318
 msgid "<b><i><big>Bandwidth</big></i></b>"
 msgstr ""
@@ -2575,10 +3173,6 @@ msgstr ""
 msgid "<b>Per Torrent Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1784
-msgid "page 8"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1817
 msgid "<i><b><big>Interface</big></b></i>"
 msgstr ""
@@ -2631,191 +3225,163 @@ msgstr ""
 msgid "Start in tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2078
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2077
+msgid "Enable Application Indicator"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2098
 msgid "Password protect system tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2108
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3285
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3469
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3653
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3837
-#: deluge/ui/gtkui/glade/connection_manager.glade:132
-#: deluge/plugins/notifications/notifications/data/config.glade:255
-msgid "Password:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2144
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2164
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2170
-msgid "page 10"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2203
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2223
 msgid "<i><b><big>Other</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2244
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2264
 msgid "Be alerted about new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2249
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2269
 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:2268
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2288
 msgid "<b>Updates</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2305
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2325
 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:2322
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2342
 msgid "Yes, please send anonymous statistics"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2344
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2364
 msgid "<b>System Information</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2387
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2407
 msgid "Location:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2399
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2419
 msgid ""
 "If Deluge cannot find the database file at this location it will fallback to "
 "using DNS to resolve the peer's country."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2423
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2443
 msgid "<b>GeoIP Database</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2468
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2488
 msgid "Associate Magnet links with Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2504
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2731
-msgid "page 11"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2537
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2557
 msgid "<i><b><big>Daemon</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2581
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2601
 msgid "Daemon port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2618
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2638
 msgid "<b>Port</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2647
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2667
 msgid "Allow Remote Connections"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2661
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2681
 msgid "<b>Connections</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2690
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2710
 msgid "Periodically check the website for new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2704
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2724
 msgid "<b>Other</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2764
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2784
 msgid "<i><b><big>Queue</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2807
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2827
 msgid "Queue new torrents to top"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2902
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2922
 msgid "Total active seeding:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2915
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2935
 msgid "Total active:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2944
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2964
 msgid "Total active downloading:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2959
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2979
 msgid "Do not count slow torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2977
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2997
 msgid "<b>Active Torrents</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3019
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3039
 msgid "Share Ratio Limit:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3029
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3049
 msgid "Seed Time Ratio:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3041
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3061
 msgid "Seed Time (m):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3109
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3129
 msgid "Stop seeding when share ratio reaches:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3154
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3174
 msgid "Remove torrent when share ratio reached"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3176
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3196
 msgid "<b>Seeding</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3208
-msgid "page 12"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3241
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3261
 msgid "<i><b><big>Proxy</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3312
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3496
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3680
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3865
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3332
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3516
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3700
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3885
 msgid "Host:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3337
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3521
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3705
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3891
-#: deluge/ui/gtkui/glade/connection_manager.glade:56
-#: deluge/plugins/notifications/notifications/data/config.glade:199
-msgid "Port:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3386
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3570
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3754
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3941
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3406
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3590
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3774
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3961
 msgid ""
 "None\n"
 "Socksv4\n"
@@ -2825,192 +3391,252 @@ msgid ""
 "HTTP W/ Auth"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3406
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3590
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3774
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3961
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:397
-msgid "Type:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3418
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3602
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3786
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3973
-#: deluge/ui/gtkui/glade/connection_manager.glade:143
-#: deluge/plugins/notifications/notifications/data/config.glade:231
-msgid "Username:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3433
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3453
 msgid "<b>Peer</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3617
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3637
 msgid "<b>Web Seed</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3801
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3821
 msgid "<b>Tracker</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3989
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4009
 msgid "<b>DHT</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4046
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4066
 msgid "<b><i><big>Cache</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4091
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4111
 msgid "Cache Size (16 KiB blocks):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4101
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4121
 msgid ""
 "The number of seconds from the last cached write to a piece in the write "
 "cache, to when it's forcefully flushed to disk. Default is 60 seconds."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4103
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4123
 msgid "Cache Expiry (seconds):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4152
-#: deluge/plugins/webui/webui/data/config.glade:94
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:153
-msgid "<b>Settings</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4199
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4219
 msgid ""
 "The total number of 16 KiB blocks written to disk since this session was "
 "started."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4201
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4221
 msgid "Blocks Written:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4210
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4230
 msgid ""
 "The total number of write operations performed since this session was "
 "started."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4212
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4232
 msgid "Writes:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4223
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4243
 msgid ""
 "The ratio (blocks_written - writes) / blocks_written represents the number "
 "of saved write operations per total write operations, i.e. a kind of cache "
 "hit ratio for the write cache."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4225
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4245
 msgid "Write Cache Hit Ratio:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4277
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4297
 msgid "<b>Write</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4307
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4327
 msgid ""
 "The number of blocks that were requested from the bittorrent engine (from "
 "peers), that were served from disk or cache."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4309
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4329
 msgid "Blocks Read:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4318
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4338
 msgid "The number of blocks that were served from cache."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4320
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4340
 msgid "Blocks Read Hit:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4331
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4351
 msgid "The cache hit ratio for the read cache."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4333
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4353
 msgid "Read Cache Hit Ratio:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4382
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4402
 msgid ""
 "The total number of read operations performed since this session was started."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4384
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4404
 msgid "Reads:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4411
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4431
 msgid "<b>Read</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4441
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4461
 msgid ""
 "The number of 16 KiB blocks currently in the disk cache. This includes both "
 "read and write cache."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4443
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4463
 msgid "Cache Size:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4473
 msgid "Read Cache Size:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4492
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4512
 msgid "<b>Size</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4535
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4555
 msgid "<b>Status</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4597
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4617
 msgid "<i><b><big>Plugins</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4722
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4742
 msgid "Version:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4746
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4766
 msgid "Homepage:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4759
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4779
 msgid "Author Email:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4801
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:441
-msgid "<b>Info</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4851
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4871
 msgid "_Install Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4894
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4914
 msgid "_Rescan Plugins"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4947
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4967
 msgid "_Find More Plugins"
 msgstr ""
 
+#: deluge/ui/gtkui/glade/tray_menu.glade:12
+msgid "_Show Deluge"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/tray_menu.glade:65
+msgid "_Resume All"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/tray_menu.glade:87
+#: deluge/ui/gtkui/glade/torrent_menu.glade:212
+msgid "_Download Speed Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/tray_menu.glade:103
+#: deluge/ui/gtkui/glade/torrent_menu.glade:227
+msgid "_Upload Speed Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/tray_menu.glade:124
+msgid "Quit & Shutdown Daemon"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:11
+msgid "_Open Folder"
+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:174
+msgid "_Force Re-check"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:191
+msgid "Move _Storage"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:242
+msgid "_Connection Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:258
+msgid "Upload _Slot Limit"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/torrent_menu.glade:273
+msgid "_Auto Managed"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog2.glade:51
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:45
+msgid "<big><b>Remove the selected torrent?</b></big>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog2.glade:66
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:57
+msgid "If you remove the data, it will be lost permanently."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog2.glade:127
+msgid "action"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog2.glade:129
+msgid "Remove Files"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog2.glade:198
+msgid "Keep Files"
+msgstr ""
+
 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
 msgid "Edit Trackers"
 msgstr ""
@@ -3019,11 +3645,6 @@ msgstr ""
 msgid "<big><b>Edit Trackers</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/edit_trackers.glade:122
-#: deluge/plugins/autoadd/autoadd/data/config.glade:87
-msgid "gtk-edit"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/edit_trackers.glade:224
 msgid "Add Tracker"
 msgstr ""
@@ -3032,11 +3653,6 @@ msgstr ""
 msgid "<b>Add Trackers</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/edit_trackers.glade:296
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1214
-msgid "Trackers:"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/edit_trackers.glade:380
 msgid "Edit Tracker"
 msgstr ""
@@ -3049,6 +3665,14 @@ msgstr ""
 msgid "Tracker:"
 msgstr ""
 
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:117
+msgid "Remove With _Data"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:155
+msgid "Remove _Torrent"
+msgstr ""
+
 #: deluge/ui/gtkui/glade/move_storage_dialog.glade:9
 msgid "Move Storage"
 msgstr ""
@@ -3060,693 +3684,3 @@ msgstr ""
 #: deluge/ui/gtkui/glade/move_storage_dialog.glade:78
 msgid "Destination:"
 msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:8
-msgid "Add Host"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:28
-#: deluge/plugins/notifications/notifications/data/config.glade:175
-msgid "Hostname:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:237
-msgid "<big><b>Connection Manager</b></big>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:363
-msgid "_Start local daemon"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:415
-msgid "Automatically connect to selected host on start-up"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:426
-msgid "Automatically start localhost if needed"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:440
-msgid "Do not show this dialog on start-up"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/connection_manager.glade:494
-msgid "gtk-connect"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:8
-msgid "Add Torrents"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:147
-msgid "_URL"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:195
-msgid "Info_hash"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:241
-msgid "_Remove"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:274
-msgid "<b>Torrents</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:331
-msgid "Fi_les"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:396
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:325
-msgid "<b>Download Location</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:434
-msgid "Full"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:450
-msgid "Compact"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:525
-msgid "Max Down Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:537
-msgid "Max Up Speed:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:668
-msgid "Add In _Paused State"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:684
-msgid "Prioritize First/Last Pieces"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:762
-msgid "Revert To Defaults"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:816
-msgid "Apply To All"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:944
-msgid "Add URL"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:983
-msgid "<b>From URL</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1018
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:27
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:385
-msgid "URL:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1104
-msgid "Add Infohash"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1143
-msgid "<b>From Infohash</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1178
-msgid "Infohash:"
-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/web/server.py:656
-msgid "Starting server in PID"
-msgstr ""
-
-#: deluge/ui/web/json_api.py:779
-msgid "Daemon doesn't exist"
-msgstr ""
-
-#: deluge/ui/web/json_api.py:785
-msgid "Daemon not running"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:178
-msgid "Notification Blink shown"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:183
-msgid "Popup notification is not enabled."
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:185
-msgid "pynotify is not installed"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:193
-msgid "pynotify failed to show notification"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:196
-msgid "Notification popup shown"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:200
-msgid "Sound notification not enabled"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:202
-msgid "pygame is not installed"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:214
-#, python-format
-msgid "Sound notification failed %s"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:218
-msgid "Sound notification Success"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:241
-msgid "Finished Torrent"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:242
-#, python-format
-msgid ""
-"The torrent \"%(name)s\" including %(num_files)i has finished downloading."
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/gtkui.py:644
-msgid "Choose Sound File"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:138
-#: deluge/plugins/notifications/notifications/core.py:171
-#, python-format
-msgid "There was an error sending the notification email: %s"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:157
-#, python-format
-msgid "The server didn't reply properly to the helo greeting: %s"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:162
-#, python-format
-msgid "The server didn't accept the username/password combination: %s"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:186
-msgid "Notification email sent."
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:194
-#, python-format
-msgid "Finished Torrent \"%(name)s\""
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/core.py:196
-#, python-format
-msgid ""
-"This email is to inform you that Deluge has finished downloading \"%(name)s"
-"\", which includes %(num_files)i files.\n"
-"To stop receiving these alerts, simply turn off email notification in "
-"Deluge's preferences.\n"
-"\n"
-"Thank you,\n"
-"Deluge."
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:29
-msgid "<b><i><big>Notifications</big></i></b>"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:81
-msgid "Tray icon blinks enabled"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:93
-msgid "Popups enabled"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:108
-msgid "Sound enabled"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:144
-msgid "<b>UI Notifications</b>"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:359
-msgid "<b>Recipients</b>"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:382
-msgid "Server requires TLS/SSL"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:442
-msgid "<b>Email Notifications</b>"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:459
-msgid "Settings"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:494
-msgid ""
-"This configuration does not mean that you'll actually receive notifications "
-"for all these events."
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:512
-msgid "Subscriptions"
-msgstr ""
-
-#: deluge/plugins/notifications/notifications/data/config.glade:593
-msgid "Sound Customization"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/gtkui.py:138
-msgid "Low Free Space"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/core.py:179
-msgid "Low Disk Space Warning"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/core.py:180
-msgid "You're running low on disk space:\n"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/core.py:183
-#, python-format
-msgid "  %s%% ocupation in %s\n"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/data/config.glade:27
-msgid "Consider low when"
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/data/config.glade:65
-msgid "of the disk is occupied."
-msgstr ""
-
-#: deluge/plugins/freespace/build/lib/freespace/data/config.glade:85
-msgid "<b>Free Space Checking</b>"
-msgstr ""
-
-#: deluge/plugins/webui/webui/gtkui.py:97
-msgid ""
-"The Deluge web interface is not installed, please install the\n"
-"interface and try again"
-msgstr ""
-
-#: deluge/plugins/webui/webui/data/config.glade:27
-msgid "Enable web interface"
-msgstr ""
-
-#: deluge/plugins/webui/webui/data/config.glade:41
-msgid "Enable SSL"
-msgstr ""
-
-#: deluge/plugins/webui/webui/data/config.glade:60
-msgid "Listening port:"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/core.py:136
-msgid "Watch folder does not exist."
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/core.py:139
-#: deluge/plugins/autoadd/autoadd/core.py:308
-msgid "Path does not exist."
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:7
-msgid "AutoAdd Error"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:78
-msgid "Watch Folder Properties"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:143
-msgid "Enable this watch folder"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:164
-msgid "<b>Watch Folder</b>"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:195
-msgid "Delete .torrent after adding"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:211
-msgid "Append extension after adding:"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:228
-msgid ".added"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:248
-msgid "<b>Torrent File Action</b>"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:275
-msgid "Set download location"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:353
-msgid "Set move completed location"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:418
-msgid "<b>Move Completed</b>"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:444
-msgid "Label: "
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:475
-msgid "<b>Label</b>"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:492
-msgid "Main"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:762
-msgid "Auto Managed:"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:836
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:904
-msgid "Yes"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:849
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:917
-msgid "No"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:890
-msgid "Add Paused:"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:936
-msgid "Queue to:"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:954
-msgid "Top"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:967
-msgid "Bottom"
-msgstr ""
-
-#: deluge/plugins/autoadd/autoadd/data/config.glade:41
-msgid "<b>Watch Folders:</b>"
-msgstr ""
-
-#: deluge/plugins/label/label/core.py:186
-msgid "Invalid label, valid characters:[a-z0-9_-]"
-msgstr ""
-
-#: deluge/plugins/label/label/core.py:187
-msgid "Empty Label"
-msgstr ""
-
-#: deluge/plugins/label/label/core.py:188
-msgid "Label already exists"
-msgstr ""
-
-#: deluge/plugins/label/label/core.py:196
-#: deluge/plugins/label/label/core.py:276
-#: deluge/plugins/label/label/core.py:311
-msgid "Unknown Label"
-msgstr ""
-
-#: deluge/plugins/label/label/core.py:312
-msgid "Unknown Torrent"
-msgstr ""
-
-#: deluge/plugins/label/label/gtkui/sidebar_menu.py:66
-msgid "Label _Options"
-msgstr ""
-
-#: deluge/plugins/label/label/gtkui/sidebar_menu.py:67
-msgid "_Remove Label"
-msgstr ""
-
-#: deluge/plugins/label/label/gtkui/sidebar_menu.py:68
-msgid "_Add Label"
-msgstr ""
-
-#: deluge/plugins/label/label/gtkui/submenu.py:48
-#: deluge/plugins/label/label/gtkui/__init__.py:77
-#: deluge/plugins/label/label/gtkui/__init__.py:111
-#: deluge/plugins/label/label/gtkui/label_config.py:59
-#: deluge/plugins/label/label/gtkui/label_config.py:66
-msgid "Label"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:7
-msgid "Label Options"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:36
-msgid "<b>Label Options</b>"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:158
-msgid "Upload Slots:\t"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:171
-msgid "Upload Speed:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:184
-msgid "Download Speed:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:226
-msgid "Connections:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:270
-msgid "Apply per torrent max settings:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:283
-msgid "Maximum"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:410
-msgid "Apply Queue settings:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:504
-msgid "Apply location settings:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:520
-msgid "Location"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:552
-msgid ""
-"tracker1.org\n"
-"tracker2.com\n"
-"this doesn't do anything yet..\n"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:563
-msgid "<i>(1 line per tracker)</i>"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:579
-msgid "Automatically apply label:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:649
-msgid "Add Label"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:683
-msgid "<b>Add Label</b>"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_options.glade:714
-msgid "Name:"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_pref.glade:22
-msgid "<i>Use the sidebar to add,edit and remove labels. </i>\n"
-msgstr ""
-
-#: deluge/plugins/label/label/data/label_pref.glade:32
-msgid "<b>Labels</b>"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/gtkui.py:67
-#: deluge/plugins/blocklist/blocklist/gtkui.py:155
-#: deluge/plugins/blocklist/blocklist/gtkui.py:186
-msgid "Blocklist"
-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/plugins/blocklist/blocklist/webui.py:49
-msgid "Emule IP list (GZip)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:50
-msgid "SafePeer Text (Zipped)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:51
-msgid "PeerGuardian Text (Uncompressed)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:52
-msgid "PeerGuardian P2B (GZip)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:91
-msgid "Days"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:117
-msgid "Check for new list every:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:133
-msgid "Import blocklist on startup"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:190
-msgid "Download the blocklist file if necessary and import the file."
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:210
-msgid "Check Download and Import"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:232
-msgid "Download a new blocklist file and import it."
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:252
-msgid "Force Download and Import"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:276
-msgid "Blocklist is up to date"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:409
-msgid "Date:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:421
-msgid "File Size:"
-msgstr ""
-
-#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:27
-msgid "Extract to:"
-msgstr ""
-
-#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:69
-msgid "Create torrent name sub-folder"
-msgstr ""
-
-#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:73
-msgid ""
-"This option will create a sub-folder using the torrent's name within the "
-"selected extract folder and put the extracted files there."
-msgstr ""
-
-#: deluge/plugins/execute/execute/gtkui.py:51
-msgid "Torrent Complete"
-msgstr ""
-
-#: deluge/plugins/execute/execute/gtkui.py:52
-msgid "Torrent Added"
-msgstr ""
-
-#: deluge/plugins/execute/execute/gtkui.py:77
-#: deluge/plugins/execute/execute/gtkui.py:88
-msgid "Execute"
-msgstr ""
-
-#: deluge/plugins/execute/execute/data/execute_prefs.glade:29
-msgid "Event"
-msgstr ""
-
-#: deluge/plugins/execute/execute/data/execute_prefs.glade:41
-msgid "Command"
-msgstr ""
-
-#: deluge/plugins/execute/execute/data/execute_prefs.glade:112
-msgid "<b>Add Command</b>"
-msgstr ""
-
-#: deluge/plugins/execute/execute/data/execute_prefs.glade:151
-msgid "<b>Commands</b>"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:238
-msgid "Download Limit:"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:247
-msgid "Upload Limit:"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:256
-msgid "Active Torrents:"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:265
-msgid "Active Downloading:"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:274
-msgid "Active Seeding:"
-msgstr ""
-
-#: deluge/plugins/scheduler/scheduler/gtkui.py:288
-msgid "<b>Slow Settings</b>"
-msgstr ""