diff --git a/deluge/i18n/deluge.pot b/deluge/i18n/deluge.pot
index 1967e40e8..d2560376a 100644
--- a/deluge/i18n/deluge.pot
+++ b/deluge/i18n/deluge.pot
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 15:16-0600\n"
+"POT-Creation-Date: 2009-05-12 10:57-0700\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: deluge/plugins/label/label/data/label_pref.glade:22
@@ -34,15 +34,15 @@ msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:132
 #: deluge/plugins/label/label/data/label_options.glade:195
-#: deluge/ui/gtkui/glade/main_window.glade:1770
-#: deluge/ui/gtkui/glade/main_window.glade:1782
-#: deluge/ui/gtkui/statusbar.py:334 deluge/ui/gtkui/statusbar.py:344
-#: deluge/ui/gtkui/statusbar.py:349 deluge/ui/gtkui/statusbar.py:361
-#: deluge/ui/gtkui/statusbar.py:372 deluge/ui/gtkui/statusbar.py:389
-#: deluge/ui/gtkui/statusbar.py:400 deluge/ui/gtkui/status_tab.py:51
-#: deluge/ui/gtkui/systemtray.py:190 deluge/ui/gtkui/systemtray.py:194
-#: deluge/ui/gtkui/systemtray.py:210 deluge/ui/gtkui/systemtray.py:216
-#: deluge/ui/gtkui/systemtray.py:333 deluge/ui/gtkui/systemtray.py:338
+#: deluge/ui/gtkui/glade/main_window.glade:1788
+#: deluge/ui/gtkui/glade/main_window.glade:1800
+#: deluge/ui/gtkui/statusbar.py:338 deluge/ui/gtkui/statusbar.py:348
+#: deluge/ui/gtkui/statusbar.py:353 deluge/ui/gtkui/statusbar.py:365
+#: deluge/ui/gtkui/statusbar.py:376 deluge/ui/gtkui/statusbar.py:393
+#: deluge/ui/gtkui/statusbar.py:404 deluge/ui/gtkui/status_tab.py:51
+#: deluge/ui/gtkui/systemtray.py:192 deluge/ui/gtkui/systemtray.py:196
+#: deluge/ui/gtkui/systemtray.py:212 deluge/ui/gtkui/systemtray.py:218
+#: deluge/ui/gtkui/systemtray.py:335 deluge/ui/gtkui/systemtray.py:340
 msgid "KiB/s"
 msgstr ""
 
@@ -71,20 +71,17 @@ msgid "Maximum"
 msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:336
-#: deluge/ui/gtkui/glade/main_window.glade:1860
-#: deluge/ui/webui/torrent_options.py:48
-#: deluge/ui/webui/scripts/template_strings.py:12
+#: deluge/ui/gtkui/glade/main_window.glade:1878
 msgid "Auto Managed"
 msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:349
-#: deluge/ui/gtkui/glade/main_window.glade:1880
+#: deluge/ui/gtkui/glade/main_window.glade:1898
 msgid "Stop seed at ratio:"
 msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:364
-#: deluge/ui/gtkui/glade/main_window.glade:1919
-#: deluge/ui/webui/torrent_options.py:51
+#: deluge/ui/gtkui/glade/main_window.glade:1937
 msgid "Remove at ratio"
 msgstr ""
 
@@ -93,85 +90,84 @@ msgid "Apply Queue settings:"
 msgstr ""
 
 #: deluge/plugins/label/label/data/label_options.glade:426
-#: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:150
-#: deluge/ui/webui/scripts/template_strings.py:83
+#: deluge/ui/gtkui/preferences.py:61
 msgid "Queue"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:465
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:148
+#: deluge/plugins/label/label/data/label_options.glade:453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:151
 msgid "Move completed to:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:493
+#: deluge/plugins/label/label/data/label_options.glade:504
 msgid "Apply location settings:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:509
+#: deluge/plugins/label/label/data/label_options.glade:520
 msgid "Location"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:541
+#: 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:552
+#: 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:568
+#: deluge/plugins/label/label/data/label_options.glade:579
 msgid "Automatically apply label:"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:585
+#: deluge/plugins/label/label/data/label_options.glade:596
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
-#: deluge/ui/webui/register_menu.py:39
 msgid "Trackers"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:638
+#: deluge/plugins/label/label/data/label_options.glade:649
 msgid "Add Label"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:672
+#: deluge/plugins/label/label/data/label_options.glade:683
 msgid "<b>Add Label</b>"
 msgstr ""
 
-#: deluge/plugins/label/label/data/label_options.glade:703
+#: deluge/plugins/label/label/data/label_options.glade:714
 msgid "Name:"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:30
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:366
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2982
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3158
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3337
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3516
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:418
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3004
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3180
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3359
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3538
 msgid "Type:"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:60
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:378
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:406
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1040
 msgid "URL:"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:89
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:736
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2524
-#: deluge/ui/gtkui/glade/main_window.glade:2103
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2545
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3829
+#: deluge/ui/gtkui/glade/main_window.glade:2121
 msgid "<b>General</b>"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:124
-msgid "Check for new list every:"
+msgid "Days"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:148
-msgid "Days"
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:150
+msgid "Check for new list every:"
 msgstr ""
 
 #: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:167
@@ -182,37 +178,41 @@ msgstr ""
 msgid "<b>Settings</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:217
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:220
 msgid "Download the blocklist file if necessary and import the file."
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:237
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:240
 msgid "Check Download and Import"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:258
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:261
 msgid "Download a new blocklist file and import it."
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:278
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:281
 msgid "Force Download and Import"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:303
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:422
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:302
+msgid "Blocklist is up to date"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:319
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:437
 msgid "<b>Options</b>"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:344
-msgid "File Size:"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:354
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:430
 msgid "Date:"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:446
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3912
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:442
+msgid "File Size:"
+msgstr ""
+
+#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:462
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4310
 msgid "<b>Info</b>"
 msgstr ""
 
@@ -230,8 +230,7 @@ msgid "Bandwidth"
 msgstr ""
 
 #: deluge/plugins/stats/stats/data/tabs.glade:66
-#: deluge/ui/gtkui/statusbar.py:144
-#: deluge/ui/webui/scripts/template_strings.py:25
+#: deluge/ui/gtkui/statusbar.py:146
 msgid "Connections"
 msgstr ""
 
@@ -240,7 +239,6 @@ msgid "Seeds/Peers"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:9
-#: deluge/ui/webui/scripts/template_strings.py:8
 msgid "Add Torrents"
 msgstr ""
 
@@ -275,10 +273,10 @@ msgid "Fi_les"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:414
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:126
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:202
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:237
-#: deluge/ui/gtkui/glade/main_window.glade:1955
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:129
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:205
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:240
+#: deluge/ui/gtkui/glade/main_window.glade:1973
 msgid "Select A Folder"
 msgstr ""
 
@@ -287,7 +285,6 @@ msgid "<b>Download Location</b>"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:473
-#: deluge/ui/webui/config_tabs_deluge.py:81
 msgid "Full"
 msgstr ""
 
@@ -296,7 +293,7 @@ msgid "Compact"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:506
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:372
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:375
 msgid "<b>Allocation</b>"
 msgstr ""
 
@@ -309,17 +306,17 @@ msgid "Max Up Speed:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:584
-#: deluge/ui/gtkui/glade/main_window.glade:1734
+#: deluge/ui/gtkui/glade/main_window.glade:1752
 msgid "Max Connections:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:598
-#: deluge/ui/gtkui/glade/main_window.glade:1797
+#: deluge/ui/gtkui/glade/main_window.glade:1815
 msgid "Max Upload Slots:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:667
-#: deluge/ui/gtkui/glade/main_window.glade:1830
+#: deluge/ui/gtkui/glade/main_window.glade:1848
 msgid "<b>Bandwidth</b>"
 msgstr ""
 
@@ -340,7 +337,7 @@ msgid "Apply To All"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:894
-#: deluge/ui/gtkui/glade/main_window.glade:2182
+#: deluge/ui/gtkui/glade/main_window.glade:2200
 msgid "_Options"
 msgstr ""
 
@@ -403,7 +400,7 @@ msgid "_Update Tracker"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/torrent_menu.glade:130
-#: deluge/ui/gtkui/glade/main_window.glade:2078
+#: deluge/ui/gtkui/glade/main_window.glade:2096
 msgid "_Edit Trackers"
 msgstr ""
 
@@ -457,300 +454,300 @@ msgstr ""
 msgid "Remove _Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:6
-#: deluge/ui/gtkui/glade/main_window.glade:422
-#: deluge/ui/gtkui/glade/main_window.glade:423
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:8
+#: deluge/ui/gtkui/glade/main_window.glade:410
+#: deluge/ui/gtkui/glade/main_window.glade:411
 msgid "Preferences"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:72
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:75
 msgid "<b><i><big>Downloads</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:109
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:112
 msgid "Download to:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:163
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:166
 msgid "Copy of .torrent files to:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:179
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:182
 msgid "Auto add .torrents from:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:301
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:304
 msgid "<b>Folders</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:337
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:340
 msgid ""
 "Full allocation preallocates all of the space that is needed for the torrent "
 "and prevents disk fragmentation"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:338
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:341
 msgid "Use Full Allocation"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:353
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:356
 msgid "Compact allocation only allocates space as needed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:354
-#: deluge/ui/webui/config_tabs_deluge.py:135
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:357
 msgid "Use Compact Allocation"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:406
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:409
 msgid "Prioritize first and last pieces of files in torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:407
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:410
 msgid "Prioritize first and last pieces of torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:447
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:422
+msgid "Add torrents in Paused state"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:462
 msgid "page 6"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:477
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:493
 msgid "<b><i><big>Network</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:518
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:534
 msgid "Deluge will automatically choose a different port to use every time."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:519
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:707
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:535
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:723
 msgid "Use Random Ports"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:537
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:553
 msgid "Active Port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:549
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:565
 msgid "0000"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:576
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:724
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:592
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:740
 msgid "From:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:604
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:752
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:620
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:768
 msgid "To:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:636
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:652
 msgid "Test Active Port"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:675
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:691
 msgid "<b>Incoming Ports</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:790
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:806
 msgid "<b>Outgoing Ports</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:825
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:841
 msgid ""
 "The TOS byte set in the IP header of every packet sent to peers (including "
 "web seeds).  Expects a Hex value."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:826
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:842
 msgid "Peer TOS Byte:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:838
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:854
 msgid "0x00"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:855
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:871
 msgid "<b>TOS</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:893
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:909
 msgid "Distributed hash table may improve the amount of active connections."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:894
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:910
 msgid "DHT"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:912
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:928
 msgid "Local Service Discovery finds local peers on your network."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:913
-#: deluge/ui/webui/config_tabs_deluge.py:73
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:929
 msgid "LSD"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:927
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:928
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:943
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:944
 msgid "Peer Exchange"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:944
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:960
 msgid "NAT Port Mapping Protocol"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:945
-#: deluge/ui/webui/config_tabs_deluge.py:71
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:961
 msgid "NAT-PMP"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:961
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:977
 msgid "Universal Plug and Play"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:962
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:978
 msgid "UPnP"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:979
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:995
 msgid "<b>Network Extras</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1017
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1033
 msgid "Inbound:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1024
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1040
 msgid "Level:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1043
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1088
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1059
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1104
 msgid ""
 "Forced\n"
 "Enabled\n"
 "Disabled"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1051
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1067
 msgid ""
 "Handshake\n"
 "Full Stream\n"
 "Either"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1078
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1094
 msgid "Outbound:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1103
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1119
 msgid "Encrypt entire stream"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1126
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1142
 msgid "<b>Encryption</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1160
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1176
 msgid "page 7"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1191
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1208
 msgid "<b><i><big>Bandwidth</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1234
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1251
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1340
 msgid "The maximum upload slots for all torrents.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1253
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1323
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1347
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1270
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1364
 msgid "The maximum upload speed for all torrents.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1273
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1291
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1290
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1308
 msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1293
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1550
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1310
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1567
 msgid "Maximum Download Speed (KiB/s):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1305
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1336
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1322
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1353
 msgid "The maximum number of connections allowed.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1325
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1563
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1342
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1580
 msgid "Maximum Upload Slots:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1338
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1576
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1355
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1593
 msgid "Maximum Connections:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1349
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1537
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1366
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1554
 msgid "Maximum Upload Speed (KiB/s):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1361
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1378
 msgid "Maximum Half-Open Connections:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1373
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1390
 msgid "Maximum Connection Attempts per Second:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1423
-#: deluge/ui/webui/config_tabs_deluge.py:113
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1440
 msgid "Ignore limits on local network"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1442
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1459
 msgid ""
 "If checked, the estimated TCP/IP overhead is drained from the rate limiters, "
 "to avoid exceeding the limits with the total traffic"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1443
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1460
 msgid "Rate limit IP overhead"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1461
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1478
 msgid "<b>Global Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1500
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1518
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1586
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1517
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1535
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1603
 msgid "The maximum number of connections per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1602
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1619
 msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1625
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1642
 msgid "<b>Per Torrent Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1652
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1669
 msgid "page 8"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1683
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1701
 msgid "<i><b><big>Interface</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1718
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1736
 msgid ""
 "Classic Mode will hide most of the daemon functionality and will make Deluge "
 "appear to be a single application.  Use this if you do not want to take "
@@ -758,207 +755,207 @@ msgid ""
 "setting to take effect."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1719
-#: deluge/ui/webui/scripts/template_strings.py:43
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1737
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3863
 msgid "Enable"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1730
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1748
 msgid "<b>Classic Mode</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1766
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1784
 msgid "Show session speed in titlebar"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1778
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1796
 msgid "<b>Main Window</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1814
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1832
 msgid "Always show"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1830
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1848
 msgid "Bring the dialog to focus"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1847
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1865
 msgid "<b>Add Torrents Dialog</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1879
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1897
 msgid "Enable system tray icon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1894
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1912
 msgid "Minimize to tray on close"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1913
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1931
 msgid "Start in tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1934
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1952
 msgid "Password protect system tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1961
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3099
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3275
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3454
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3633
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1979
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3121
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3297
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3476
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3655
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3964
 #: deluge/ui/gtkui/glade/connection_manager.glade:132
 msgid "Password:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1996
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2014
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2022
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2040
 msgid "page 10"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2053
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2072
 msgid "<i><b><big>Other</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2095
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2114
 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:2096
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2115
 msgid "Be alerted about new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2115
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2134
 msgid "<b>Updates</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2151
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2170
 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:2170
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2189
 msgid "Yes, please send anonymous statistics"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2189
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2208
 msgid "<b>System Information</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2216
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2437
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2235
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2457
 msgid "page 11"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2247
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2267
 msgid "<i><b><big>Daemon</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2289
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2309
 msgid "Daemon port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2324
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2344
 msgid "<b>Port</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2356
-#: deluge/ui/webui/config_tabs_deluge.py:145
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2376
 msgid "Allow Remote Connections"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2367
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2387
 msgid "<b>Connections</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2399
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2419
 msgid "Periodically check the website for new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2410
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2430
 msgid "<b>Other</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2468
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2489
 msgid "<i><b><big>Queue</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2511
-#: deluge/ui/webui/config_tabs_deluge.py:153
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2532
 msgid "Queue new torrents to top"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2565
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2586
 msgid "Total active downloading:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2596
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2617
 msgid "Total active:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2606
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2627
 msgid "Total active seeding:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2654
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2675
 msgid "Do not count slow torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2670
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2691
 msgid "<b>Active Torrents</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2759
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2780
 msgid "Seed Time (m):"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2771
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2792
 msgid "Seed Time Ratio:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2783
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2804
 msgid "Share Ratio Limit:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2801
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2822
 msgid "Stop seeding when share ratio reaches:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2846
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2867
 msgid "Remove torrent when share ratio reached"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2864
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2885
 msgid "<b>Seeding</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2896
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2917
 msgid "page 12"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2927
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2949
 msgid "<i><b><big>Proxy</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2969
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3145
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3324
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3503
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2991
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3167
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3346
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3525
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3939
 #: deluge/ui/gtkui/glade/connection_manager.glade:143
 msgid "Username:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2992
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3168
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3347
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3526
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3014
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3190
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3369
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3548
 msgid ""
 "None\n"
 "Socksv4\n"
@@ -968,72 +965,123 @@ msgid ""
 "HTTP W/ Auth"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3046
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3222
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3401
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3580
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3068
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3244
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3423
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3602
 #: deluge/ui/gtkui/glade/connection_manager.glade:56
 msgid "Port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3071
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3247
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3426
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3605
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3093
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3269
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3448
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3627
 msgid "Host:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3114
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3136
 msgid "<b>Peer</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3290
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3312
 msgid "<b>Web Seed</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3469
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3491
 msgid "<b>Tracker</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3648
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3670
 msgid "<b>DHT</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3710
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3724
+msgid "<b><i><big>Notification</big></i></b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3779
+msgid "Blinking tray icon"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3793
+msgid "Not available on Windows"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3794
+msgid "Popup"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3810
+msgid "Only OGG and WAV files are supported"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3811
+msgid "Sound:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3889
+msgid "Address:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3914
+msgid "Server:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3980
+msgid "None"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3994
+msgid "SSL"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4009
+msgid "TLS"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4033
+msgid "Security:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4048
+msgid "<b>Email</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4108
 msgid "<i><b><big>Plugins</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3808
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4206
 msgid "Author Email:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3821
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4219
 msgid "Homepage:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3834
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4232
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:263
 msgid "Author:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3845
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4243
 msgid "Version:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3859
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4257
 msgid "Details:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3962
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4360
 msgid "_Install Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4004
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4402
 msgid "_Rescan Plugins"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
-#: deluge/ui/webui/scripts/template_strings.py:42
 msgid "Edit Trackers"
 msgstr ""
 
@@ -1078,7 +1126,6 @@ msgid "Automatically add torrents on connect"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/move_storage_dialog.glade:9
-#: deluge/ui/webui/scripts/template_strings.py:62
 msgid "Move Storage"
 msgstr ""
 
@@ -1099,8 +1146,8 @@ msgid "Hostname:"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/connection_manager.glade:204
-#: deluge/ui/gtkui/glade/main_window.glade:436
-#: deluge/ui/gtkui/glade/main_window.glade:437
+#: deluge/ui/gtkui/glade/main_window.glade:424
+#: deluge/ui/gtkui/glade/main_window.glade:425
 msgid "Connection Manager"
 msgstr ""
 
@@ -1126,8 +1173,6 @@ msgstr ""
 
 #: deluge/ui/gtkui/glade/connection_manager.glade:457
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:618
-#: deluge/ui/webui/register_menu.py:38
-#: deluge/ui/webui/scripts/template_strings.py:73
 msgid "Options"
 msgstr ""
 
@@ -1135,20 +1180,7 @@ msgstr ""
 msgid "gtk-connect"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/wizard.glade:6
-msgid "Deluge Setup Wizard"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/wizard.glade:10
-msgid "This wizard will help you set up Deluge to your liking."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/wizard.glade:25
-msgid "All Finished!"
-msgstr ""
-
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:7
-#: deluge/ui/webui/scripts/template_strings.py:26
 msgid "Create Torrent"
 msgstr ""
 
@@ -1194,7 +1226,6 @@ msgid ""
 msgstr ""
 
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:574
-#: deluge/ui/webui/torrent_add.py:49
 msgid "Set Private Flag"
 msgstr ""
 
@@ -1233,7 +1264,7 @@ msgid "label"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/dgtkpopups.glade:154
-#: deluge/ui/gtkui/glade/main_window.glade:2584
+#: deluge/ui/gtkui/glade/main_window.glade:2602
 msgid "Add Peer"
 msgstr ""
 
@@ -1344,354 +1375,1262 @@ msgid "Community"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:313
-#: deluge/ui/webui/scripts/template_strings.py:9
 msgid "Add torrent"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:314
-#: deluge/ui/webui/scripts/template_strings.py:7
 msgid "Add Torrent"
 msgstr ""
 
 #: deluge/ui/gtkui/glade/main_window.glade:327
-#: deluge/ui/webui/scripts/template_strings.py:88
 msgid "Remove Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:348
+#: deluge/ui/gtkui/glade/main_window.glade:344
 msgid "Pause the selected torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:349
-#: deluge/ui/webui/scripts/template_strings.py:77
+#: deluge/ui/gtkui/glade/main_window.glade:345
 msgid "Pause"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:363
+#: deluge/ui/gtkui/glade/main_window.glade:359
 msgid "Resume the selected torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:364
-#: deluge/ui/webui/scripts/template_strings.py:91
+#: deluge/ui/gtkui/glade/main_window.glade:360
 msgid "Resume"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:386
+#: deluge/ui/gtkui/glade/main_window.glade:378
 msgid "Queue Torrent Up"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:387
-#: deluge/ui/webui/register_menu.py:47
+#: deluge/ui/gtkui/glade/main_window.glade:379
 msgid "Queue Up"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:400
+#: deluge/ui/gtkui/glade/main_window.glade:392
 msgid "Queue Torrent Down"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:401
-#: deluge/ui/webui/register_menu.py:48
+#: deluge/ui/gtkui/glade/main_window.glade:393
 msgid "Queue Down"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:551
+#: deluge/ui/gtkui/glade/main_window.glade:538
 msgid "_Expand All"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:571
+#: deluge/ui/gtkui/glade/main_window.glade:558
 msgid "_Do Not Download"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:586
+#: deluge/ui/gtkui/glade/main_window.glade:573
 msgid "_Normal Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:601
+#: deluge/ui/gtkui/glade/main_window.glade:588
 msgid "_High Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:616
+#: deluge/ui/gtkui/glade/main_window.glade:603
 msgid "Hi_ghest Priority"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:694
+#: deluge/ui/gtkui/glade/main_window.glade:681
 msgid "<b>Auto Managed:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:735
+#: deluge/ui/gtkui/glade/main_window.glade:722
 msgid "<b>Seed Rank:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:750
+#: deluge/ui/gtkui/glade/main_window.glade:737
 msgid "<b>Seeding Time:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:776
+#: deluge/ui/gtkui/glade/main_window.glade:763
 msgid "<b>Active Time:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:833
+#: deluge/ui/gtkui/glade/main_window.glade:820
 msgid "<b>Tracker Status:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:863
+#: deluge/ui/gtkui/glade/main_window.glade:850
 msgid "<b>Availability:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:917
+#: deluge/ui/gtkui/glade/main_window.glade:904
 msgid "<b>Peers:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:943
+#: deluge/ui/gtkui/glade/main_window.glade:930
 msgid "<b>Seeders:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:961
+#: deluge/ui/gtkui/glade/main_window.glade:948
 msgid "<b>Pieces:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:983
+#: deluge/ui/gtkui/glade/main_window.glade:970
 msgid "<b>ETA:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1005
-#: deluge/ui/gtkui/glade/main_window.glade:1027
+#: deluge/ui/gtkui/glade/main_window.glade:992
+#: deluge/ui/gtkui/glade/main_window.glade:1014
 msgid "<b>Speed:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1046
+#: deluge/ui/gtkui/glade/main_window.glade:1033
 msgid "<b>Next Announce:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1065
+#: deluge/ui/gtkui/glade/main_window.glade:1052
 msgid "<b>Share Ratio:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1084
+#: deluge/ui/gtkui/glade/main_window.glade:1071
 msgid "<b>Uploaded:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1103
+#: deluge/ui/gtkui/glade/main_window.glade:1090
 msgid "<b>Downloaded:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1164
+#: deluge/ui/gtkui/glade/main_window.glade:1151
 msgid "<b>Date Added:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1219
+#: deluge/ui/gtkui/glade/main_window.glade:1206
 msgid "_Status"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1290
+#: deluge/ui/gtkui/glade/main_window.glade:1279
+msgid "<b>Comments:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:1308
 msgid "<b># of files:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1322
+#: deluge/ui/gtkui/glade/main_window.glade:1340
 msgid "<b>Hash:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1352
+#: deluge/ui/gtkui/glade/main_window.glade:1370
 msgid "<b>Tracker:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1372
+#: deluge/ui/gtkui/glade/main_window.glade:1390
 msgid "<b>Total Size:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1410
+#: deluge/ui/gtkui/glade/main_window.glade:1428
 msgid "<b>Name:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1430
+#: deluge/ui/gtkui/glade/main_window.glade:1448
 msgid "<b>Path:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1464
+#: deluge/ui/gtkui/glade/main_window.glade:1482
 msgid "<b>Status:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1530
+#: deluge/ui/gtkui/glade/main_window.glade:1548
 msgid "_Details"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1579
+#: deluge/ui/gtkui/glade/main_window.glade:1597
 msgid "_Files"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1628
+#: deluge/ui/gtkui/glade/main_window.glade:1646
 msgid "_Peers"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1747
+#: deluge/ui/gtkui/glade/main_window.glade:1765
 msgid "Max Upload Speed:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1760
+#: deluge/ui/gtkui/glade/main_window.glade:1778
 msgid "Max Download Speed:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1935
+#: deluge/ui/gtkui/glade/main_window.glade:1953
 msgid "Move completed:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:1992
+#: deluge/ui/gtkui/glade/main_window.glade:2010
 msgid "<b>Queue</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2029
-#: deluge/ui/webui/scripts/template_strings.py:81
+#: deluge/ui/gtkui/glade/main_window.glade:2047
 msgid "Private"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2042
-#: deluge/ui/webui/torrent_options.py:45
+#: deluge/ui/gtkui/glade/main_window.glade:2060
 msgid "Prioritize First/Last"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2202
+#: deluge/ui/gtkui/glade/main_window.glade:2220
 msgid "Remove Torrent?"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2238
+#: deluge/ui/gtkui/glade/main_window.glade:2256
 msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2289
+#: deluge/ui/gtkui/glade/main_window.glade:2307
 msgid "<i>The associated .torrent will be deleted!</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2328
+#: deluge/ui/gtkui/glade/main_window.glade:2346
 msgid "<i>The downloaded data will be deleted!</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2372
+#: deluge/ui/gtkui/glade/main_window.glade:2390
 msgid "Remove Selected Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2390
+#: deluge/ui/gtkui/glade/main_window.glade:2408
 msgid "New Release"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2421
+#: deluge/ui/gtkui/glade/main_window.glade:2439
 msgid "<b><big>New Release Available!</big></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2472
+#: deluge/ui/gtkui/glade/main_window.glade:2490
 msgid "<i>Available Version:</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2495
+#: deluge/ui/gtkui/glade/main_window.glade:2513
 msgid "<i>Current Version:</i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2517
+#: deluge/ui/gtkui/glade/main_window.glade:2535
 msgid "Do not show this dialog in the future"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2557
+#: deluge/ui/gtkui/glade/main_window.glade:2575
 msgid "_Goto Website"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:2583
+#: deluge/ui/gtkui/glade/main_window.glade:2601
 msgid "Add a peer by its IP"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:670
+#: deluge/core/torrentmanager.py:698
 msgid "Announce OK"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:691
+#: deluge/core/torrentmanager.py:714
 msgid "Announce Sent"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:699
+#: deluge/core/torrentmanager.py:722
 msgid "Warning"
 msgstr ""
 
-#: deluge/core/torrentmanager.py:709
-#: deluge/ui/webui/scripts/template_strings.py:44
+#: deluge/core/torrentmanager.py:732
 msgid "Error"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:63
-msgid "Error setting label options"
+#: deluge/countries.py:9
+msgid "Afghanistan"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:123
-msgid "apply_max"
+#: deluge/countries.py:10
+msgid "Aland Islands"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:124
-msgid "max_download_speed"
+#: deluge/countries.py:11
+msgid "Albania"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:125
-msgid "max_upload_speed"
+#: deluge/countries.py:12
+msgid "Algeria"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:126
-msgid "max_upload_slots"
+#: deluge/countries.py:13
+msgid "American Samoa"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:127
-msgid "max_connections"
+#: deluge/countries.py:14
+msgid "Andorra"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:130
-msgid "apply_queue"
+#: deluge/countries.py:15
+msgid "Angola"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:131
-msgid "is_auto_managed"
+#: deluge/countries.py:16
+msgid "Anguilla"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:132
-msgid "stop_at_ratio"
+#: deluge/countries.py:17
+msgid "Antarctica"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:133
-msgid "stop_ratio"
+#: deluge/countries.py:18
+msgid "Antigua and Barbuda"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:134
-msgid "remove_at_ratio"
+#: deluge/countries.py:19
+msgid "Argentina"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:137
-msgid "apply_move_completed"
+#: deluge/countries.py:20
+msgid "Armenia"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:138
-msgid "move_completed"
+#: deluge/countries.py:21
+msgid "Aruba"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:139
-msgid "move_completed_path"
+#: deluge/countries.py:22
+msgid "Australia"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:142
-msgid "auto_add"
+#: deluge/countries.py:23
+msgid "Austria"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:143
-msgid "auto_add_trackers"
+#: deluge/countries.py:24
+msgid "Azerbaijan"
+msgstr ""
+
+#: deluge/countries.py:25
+msgid "Bahamas"
+msgstr ""
+
+#: deluge/countries.py:26
+msgid "Bahrain"
+msgstr ""
+
+#: deluge/countries.py:27
+msgid "Bangladesh"
+msgstr ""
+
+#: deluge/countries.py:28
+msgid "Barbados"
+msgstr ""
+
+#: deluge/countries.py:29
+msgid "Belarus"
+msgstr ""
+
+#: deluge/countries.py:30
+msgid "Belgium"
+msgstr ""
+
+#: deluge/countries.py:31
+msgid "Belize"
+msgstr ""
+
+#: deluge/countries.py:32
+msgid "Benin"
+msgstr ""
+
+#: deluge/countries.py:33
+msgid "Bermuda"
+msgstr ""
+
+#: deluge/countries.py:34
+msgid "Bhutan"
+msgstr ""
+
+#: deluge/countries.py:35
+msgid "Bolivia"
+msgstr ""
+
+#: deluge/countries.py:36
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: deluge/countries.py:37
+msgid "Botswana"
+msgstr ""
+
+#: deluge/countries.py:38
+msgid "Bouvet Island"
+msgstr ""
+
+#: deluge/countries.py:39
+msgid "Brazil"
+msgstr ""
+
+#: deluge/countries.py:40
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: deluge/countries.py:41
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: deluge/countries.py:42
+msgid "Bulgaria"
+msgstr ""
+
+#: deluge/countries.py:43
+msgid "Burkina Faso"
+msgstr ""
+
+#: deluge/countries.py:44
+msgid "Burundi"
+msgstr ""
+
+#: deluge/countries.py:45
+msgid "Cambodia"
+msgstr ""
+
+#: deluge/countries.py:46
+msgid "Cameroon"
+msgstr ""
+
+#: deluge/countries.py:47
+msgid "Canada"
+msgstr ""
+
+#: deluge/countries.py:48
+msgid "Cape Verde"
+msgstr ""
+
+#: deluge/countries.py:49
+msgid "Cayman Islands"
+msgstr ""
+
+#: deluge/countries.py:50
+msgid "Central African Republic"
+msgstr ""
+
+#: deluge/countries.py:51
+msgid "Chad"
+msgstr ""
+
+#: deluge/countries.py:52
+msgid "Chile"
+msgstr ""
+
+#: deluge/countries.py:53
+msgid "China"
+msgstr ""
+
+#: deluge/countries.py:54
+msgid "Christmas Island"
+msgstr ""
+
+#: deluge/countries.py:55
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: deluge/countries.py:56
+msgid "Colombia"
+msgstr ""
+
+#: deluge/countries.py:57
+msgid "Comoros"
+msgstr ""
+
+#: deluge/countries.py:58
+msgid "Congo"
+msgstr ""
+
+#: deluge/countries.py:59
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: deluge/countries.py:60
+msgid "Cook Islands"
+msgstr ""
+
+#: deluge/countries.py:61
+msgid "Costa Rica"
+msgstr ""
+
+#: deluge/countries.py:62
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: deluge/countries.py:63
+msgid "Croatia"
+msgstr ""
+
+#: deluge/countries.py:64
+msgid "Cuba"
+msgstr ""
+
+#: deluge/countries.py:65
+msgid "Cyprus"
+msgstr ""
+
+#: deluge/countries.py:66
+msgid "Czech Republic"
+msgstr ""
+
+#: deluge/countries.py:67
+msgid "Denmark"
+msgstr ""
+
+#: deluge/countries.py:68
+msgid "Djibouti"
+msgstr ""
+
+#: deluge/countries.py:69
+msgid "Dominica"
+msgstr ""
+
+#: deluge/countries.py:70
+msgid "Dominican Republic"
+msgstr ""
+
+#: deluge/countries.py:71
+msgid "Ecuador"
+msgstr ""
+
+#: deluge/countries.py:72
+msgid "Egypt"
+msgstr ""
+
+#: deluge/countries.py:73
+msgid "El Salvador"
+msgstr ""
+
+#: deluge/countries.py:74
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: deluge/countries.py:75
+msgid "Eritrea"
+msgstr ""
+
+#: deluge/countries.py:76
+msgid "Estonia"
+msgstr ""
+
+#: deluge/countries.py:77
+msgid "Ethiopia"
+msgstr ""
+
+#: deluge/countries.py:78
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: deluge/countries.py:79
+msgid "Faroe Islands"
+msgstr ""
+
+#: deluge/countries.py:80
+msgid "Fiji"
+msgstr ""
+
+#: deluge/countries.py:81
+msgid "Finland"
+msgstr ""
+
+#: deluge/countries.py:82
+msgid "France"
+msgstr ""
+
+#: deluge/countries.py:83
+msgid "French Guiana"
+msgstr ""
+
+#: deluge/countries.py:84
+msgid "French Polynesia"
+msgstr ""
+
+#: deluge/countries.py:85
+msgid "French Southern Territories"
+msgstr ""
+
+#: deluge/countries.py:86
+msgid "Gabon"
+msgstr ""
+
+#: deluge/countries.py:87
+msgid "Gambia"
+msgstr ""
+
+#: deluge/countries.py:88
+msgid "Georgia"
+msgstr ""
+
+#: deluge/countries.py:89
+msgid "Germany"
+msgstr ""
+
+#: deluge/countries.py:90 deluge/countries.py:241
+msgid "United Kingdom"
+msgstr ""
+
+#: deluge/countries.py:91
+msgid "Ghana"
+msgstr ""
+
+#: deluge/countries.py:92
+msgid "Gibraltar"
+msgstr ""
+
+#: deluge/countries.py:93
+msgid "Greece"
+msgstr ""
+
+#: deluge/countries.py:94
+msgid "Greenland"
+msgstr ""
+
+#: deluge/countries.py:95
+msgid "Grenada"
+msgstr ""
+
+#: deluge/countries.py:96
+msgid "Guadeloupe"
+msgstr ""
+
+#: deluge/countries.py:97
+msgid "Guam"
+msgstr ""
+
+#: deluge/countries.py:98
+msgid "Guatemala"
+msgstr ""
+
+#: deluge/countries.py:99
+msgid "Guernsey"
+msgstr ""
+
+#: deluge/countries.py:100
+msgid "Guinea"
+msgstr ""
+
+#: deluge/countries.py:101
+msgid "Guinea-Bissau"
+msgstr ""
+
+#: deluge/countries.py:102
+msgid "Guyana"
+msgstr ""
+
+#: deluge/countries.py:103
+msgid "Haiti"
+msgstr ""
+
+#: deluge/countries.py:104
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#: deluge/countries.py:105
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#: deluge/countries.py:106
+msgid "Honduras"
+msgstr ""
+
+#: deluge/countries.py:107
+msgid "Hong Kong"
+msgstr ""
+
+#: deluge/countries.py:108
+msgid "Hungary"
+msgstr ""
+
+#: deluge/countries.py:109
+msgid "Iceland"
+msgstr ""
+
+#: deluge/countries.py:110
+msgid "India"
+msgstr ""
+
+#: deluge/countries.py:111
+msgid "Indonesia"
+msgstr ""
+
+#: deluge/countries.py:112
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: deluge/countries.py:113
+msgid "Iraq"
+msgstr ""
+
+#: deluge/countries.py:114
+msgid "Ireland"
+msgstr ""
+
+#: deluge/countries.py:115
+msgid "Isle of Man"
+msgstr ""
+
+#: deluge/countries.py:116
+msgid "Israel"
+msgstr ""
+
+#: deluge/countries.py:117
+msgid "Italy"
+msgstr ""
+
+#: deluge/countries.py:118
+msgid "Jamaica"
+msgstr ""
+
+#: deluge/countries.py:119
+msgid "Japan"
+msgstr ""
+
+#: deluge/countries.py:120
+msgid "Jersey"
+msgstr ""
+
+#: deluge/countries.py:121
+msgid "Jordan"
+msgstr ""
+
+#: deluge/countries.py:122
+msgid "Kazakhstan"
+msgstr ""
+
+#: deluge/countries.py:123
+msgid "Kenya"
+msgstr ""
+
+#: deluge/countries.py:124
+msgid "Kiribati"
+msgstr ""
+
+#: deluge/countries.py:125
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: deluge/countries.py:126
+msgid "Korea, Republic of"
+msgstr ""
+
+#: deluge/countries.py:127
+msgid "Kuwait"
+msgstr ""
+
+#: deluge/countries.py:128
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: deluge/countries.py:129
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: deluge/countries.py:130
+msgid "Latvia"
+msgstr ""
+
+#: deluge/countries.py:131
+msgid "Lebanon"
+msgstr ""
+
+#: deluge/countries.py:132
+msgid "Lesotho"
+msgstr ""
+
+#: deluge/countries.py:133
+msgid "Liberia"
+msgstr ""
+
+#: deluge/countries.py:134
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: deluge/countries.py:135
+msgid "Liechtenstein"
+msgstr ""
+
+#: deluge/countries.py:136
+msgid "Lithuania"
+msgstr ""
+
+#: deluge/countries.py:137
+msgid "Luxembourg"
+msgstr ""
+
+#: deluge/countries.py:138
+msgid "Macao"
+msgstr ""
+
+#: deluge/countries.py:139
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: deluge/countries.py:140
+msgid "Madagascar"
+msgstr ""
+
+#: deluge/countries.py:141
+msgid "Malawi"
+msgstr ""
+
+#: deluge/countries.py:142
+msgid "Malaysia"
+msgstr ""
+
+#: deluge/countries.py:143
+msgid "Maldives"
+msgstr ""
+
+#: deluge/countries.py:144
+msgid "Mali"
+msgstr ""
+
+#: deluge/countries.py:145
+msgid "Malta"
+msgstr ""
+
+#: deluge/countries.py:146
+msgid "Marshall Islands"
+msgstr ""
+
+#: deluge/countries.py:147
+msgid "Martinique"
+msgstr ""
+
+#: deluge/countries.py:148
+msgid "Mauritania"
+msgstr ""
+
+#: deluge/countries.py:149
+msgid "Mauritius"
+msgstr ""
+
+#: deluge/countries.py:150
+msgid "Mayotte"
+msgstr ""
+
+#: deluge/countries.py:151
+msgid "Mexico"
+msgstr ""
+
+#: deluge/countries.py:152
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: deluge/countries.py:153
+msgid "Moldova"
+msgstr ""
+
+#: deluge/countries.py:154
+msgid "Monaco"
+msgstr ""
+
+#: deluge/countries.py:155
+msgid "Mongolia"
+msgstr ""
+
+#: deluge/countries.py:156
+msgid "Montenegro"
+msgstr ""
+
+#: deluge/countries.py:157
+msgid "Montserrat"
+msgstr ""
+
+#: deluge/countries.py:158
+msgid "Morocco"
+msgstr ""
+
+#: deluge/countries.py:159
+msgid "Mozambique"
+msgstr ""
+
+#: deluge/countries.py:160
+msgid "Myanmar"
+msgstr ""
+
+#: deluge/countries.py:161
+msgid "Namibia"
+msgstr ""
+
+#: deluge/countries.py:162
+msgid "Nauru"
+msgstr ""
+
+#: deluge/countries.py:163
+msgid "Nepal"
+msgstr ""
+
+#: deluge/countries.py:164
+msgid "Netherlands"
+msgstr ""
+
+#: deluge/countries.py:165
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: deluge/countries.py:166
+msgid "New Caledonia"
+msgstr ""
+
+#: deluge/countries.py:167
+msgid "New Zealand"
+msgstr ""
+
+#: deluge/countries.py:168
+msgid "Nicaragua"
+msgstr ""
+
+#: deluge/countries.py:169
+msgid "Niger"
+msgstr ""
+
+#: deluge/countries.py:170
+msgid "Nigeria"
+msgstr ""
+
+#: deluge/countries.py:171
+msgid "Niue"
+msgstr ""
+
+#: deluge/countries.py:172
+msgid "Norfolk Island"
+msgstr ""
+
+#: deluge/countries.py:173
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: deluge/countries.py:174
+msgid "Norway"
+msgstr ""
+
+#: deluge/countries.py:175
+msgid "Oman"
+msgstr ""
+
+#: deluge/countries.py:176
+msgid "Pakistan"
+msgstr ""
+
+#: deluge/countries.py:177
+msgid "Palau"
+msgstr ""
+
+#: deluge/countries.py:178
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#: deluge/countries.py:179
+msgid "Panama"
+msgstr ""
+
+#: deluge/countries.py:180
+msgid "Papua New Guinea"
+msgstr ""
+
+#: deluge/countries.py:181
+msgid "Paraguay"
+msgstr ""
+
+#: deluge/countries.py:182
+msgid "Peru"
+msgstr ""
+
+#: deluge/countries.py:183
+msgid "Philippines"
+msgstr ""
+
+#: deluge/countries.py:184
+msgid "Pitcairn"
+msgstr ""
+
+#: deluge/countries.py:185
+msgid "Poland"
+msgstr ""
+
+#: deluge/countries.py:186
+msgid "Portugal"
+msgstr ""
+
+#: deluge/countries.py:187
+msgid "Puerto Rico"
+msgstr ""
+
+#: deluge/countries.py:188
+msgid "Qatar"
+msgstr ""
+
+#: deluge/countries.py:189
+msgid "Reunion"
+msgstr ""
+
+#: deluge/countries.py:190
+msgid "Romania"
+msgstr ""
+
+#: deluge/countries.py:191
+msgid "Russian Federation"
+msgstr ""
+
+#: deluge/countries.py:192
+msgid "Rwanda"
+msgstr ""
+
+#: deluge/countries.py:193
+msgid "Saint Barthelemy"
+msgstr ""
+
+#: deluge/countries.py:194
+msgid "Saint Helena"
+msgstr ""
+
+#: deluge/countries.py:195
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: deluge/countries.py:196
+msgid "Saint Lucia"
+msgstr ""
+
+#: deluge/countries.py:197
+msgid "Saint Martin"
+msgstr ""
+
+#: deluge/countries.py:198
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#: deluge/countries.py:199
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
+#: deluge/countries.py:200
+msgid "Samoa"
+msgstr ""
+
+#: deluge/countries.py:201
+msgid "San Marino"
+msgstr ""
+
+#: deluge/countries.py:202
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: deluge/countries.py:203
+msgid "Saudi Arabia"
+msgstr ""
+
+#: deluge/countries.py:204
+msgid "Senegal"
+msgstr ""
+
+#: deluge/countries.py:205
+msgid "Serbia"
+msgstr ""
+
+#: deluge/countries.py:206
+msgid "Seychelles"
+msgstr ""
+
+#: deluge/countries.py:207
+msgid "Sierra Leone"
+msgstr ""
+
+#: deluge/countries.py:208
+msgid "Singapore"
+msgstr ""
+
+#: deluge/countries.py:209
+msgid "Slovakia"
+msgstr ""
+
+#: deluge/countries.py:210
+msgid "Slovenia"
+msgstr ""
+
+#: deluge/countries.py:211
+msgid "Solomon Islands"
+msgstr ""
+
+#: deluge/countries.py:212
+msgid "Somalia"
+msgstr ""
+
+#: deluge/countries.py:213
+msgid "South Africa"
+msgstr ""
+
+#: deluge/countries.py:214
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#: deluge/countries.py:215
+msgid "Spain"
+msgstr ""
+
+#: deluge/countries.py:216
+msgid "Sri Lanka"
+msgstr ""
+
+#: deluge/countries.py:217
+msgid "Sudan"
+msgstr ""
+
+#: deluge/countries.py:218
+msgid "Suriname"
+msgstr ""
+
+#: deluge/countries.py:219
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
+#: deluge/countries.py:220
+msgid "Swaziland"
+msgstr ""
+
+#: deluge/countries.py:221
+msgid "Sweden"
+msgstr ""
+
+#: deluge/countries.py:222
+msgid "Switzerland"
+msgstr ""
+
+#: deluge/countries.py:223
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: deluge/countries.py:224
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#: deluge/countries.py:225
+msgid "Tajikistan"
+msgstr ""
+
+#: deluge/countries.py:226
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: deluge/countries.py:227
+msgid "Thailand"
+msgstr ""
+
+#: deluge/countries.py:228
+msgid "Timor-Leste"
+msgstr ""
+
+#: deluge/countries.py:229
+msgid "Togo"
+msgstr ""
+
+#: deluge/countries.py:230
+msgid "Tokelau"
+msgstr ""
+
+#: deluge/countries.py:231
+msgid "Tonga"
+msgstr ""
+
+#: deluge/countries.py:232
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: deluge/countries.py:233
+msgid "Tunisia"
+msgstr ""
+
+#: deluge/countries.py:234
+msgid "Turkey"
+msgstr ""
+
+#: deluge/countries.py:235
+msgid "Turkmenistan"
+msgstr ""
+
+#: deluge/countries.py:236
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: deluge/countries.py:237
+msgid "Tuvalu"
+msgstr ""
+
+#: deluge/countries.py:238
+msgid "Uganda"
+msgstr ""
+
+#: deluge/countries.py:239
+msgid "Ukraine"
+msgstr ""
+
+#: deluge/countries.py:240
+msgid "United Arab Emirates"
+msgstr ""
+
+#: deluge/countries.py:242
+msgid "United States"
+msgstr ""
+
+#: deluge/countries.py:243
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: deluge/countries.py:244
+msgid "Uruguay"
+msgstr ""
+
+#: deluge/countries.py:245
+msgid "Uzbekistan"
+msgstr ""
+
+#: deluge/countries.py:246
+msgid "Vanuatu"
+msgstr ""
+
+#: deluge/countries.py:247
+msgid "Venezuela"
+msgstr ""
+
+#: deluge/countries.py:248
+msgid "Viet Nam"
+msgstr ""
+
+#: deluge/countries.py:249
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: deluge/countries.py:250
+msgid "Virgin Islands, U.S."
+msgstr ""
+
+#: deluge/countries.py:251
+msgid "Wallis and Futuna"
+msgstr ""
+
+#: deluge/countries.py:252
+msgid "Western Sahara"
+msgstr ""
+
+#: deluge/countries.py:253
+msgid "Yemen"
+msgstr ""
+
+#: deluge/countries.py:254
+msgid "Zambia"
+msgstr ""
+
+#: deluge/countries.py:255
+msgid "Zimbabwe"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:154
 #: deluge/plugins/label/label/gtkui/label_config.py:48
 #: deluge/plugins/label/label/gtkui/label_config.py:55
-#: deluge/plugins/label/label/gtkui/submenu.py:40
+#: deluge/plugins/label/label/gtkui/submenu.py:39
 #: deluge/plugins/label/label/gtkui/__init__.py:69
 #: deluge/plugins/label/label/gtkui/__init__.py:103
-#: deluge/ui/webui/scripts/template_strings.py:57
 msgid "Label"
 msgstr ""
 
-#: deluge/plugins/label/label/webui.py:155
-msgid "Work in progress.."
-msgstr ""
-
 #: deluge/plugins/label/label/gtkui/sidebar_menu.py:55
 msgid "Label _Options"
 msgstr ""
@@ -1704,25 +2643,25 @@ msgstr ""
 msgid "_Add Label"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:191
+#: deluge/plugins/label/label/core.py:189
 msgid "Invalid label, valid characters:[a-z0-9_-]"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:192
+#: deluge/plugins/label/label/core.py:190
 msgid "Empty Label"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:193
+#: deluge/plugins/label/label/core.py:191
 msgid "Label already exists"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:200
-#: deluge/plugins/label/label/core.py:257
-#: deluge/plugins/label/label/core.py:292
+#: deluge/plugins/label/label/core.py:198
+#: deluge/plugins/label/label/core.py:255
+#: deluge/plugins/label/label/core.py:290
 msgid "Unknown Label"
 msgstr ""
 
-#: deluge/plugins/label/label/core.py:293
+#: deluge/plugins/label/label/core.py:291
 msgid "Unknown Torrent"
 msgstr ""
 
@@ -1742,64 +2681,8 @@ msgstr ""
 msgid "PeerGuardian P2B (GZip)"
 msgstr ""
 
-#: deluge/plugins/blocklist/blocklist/webui.py:50
-msgid "BlockList"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:67
-#: deluge/ui/webui/torrent_add.py:57
-msgid "Url"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:68
-msgid "Check for every (days)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:69
-msgid "Timeout (seconds)"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:70
-msgid "Times to attempt download"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:71
-msgid "Import on daemon startup"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:73
-msgid "Import Now"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:74
-msgid "Force Download"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:81
-#, python-format
-msgid "Downloading %.2f%%"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:83
-#, python-format
-msgid "Importing %s"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:85
-#, python-format
-msgid "Blocked Ranges: %s"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:87
-msgid "Inactive"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/webui.py:94
-msgid "Refresh status"
-msgstr ""
-
-#: deluge/plugins/blocklist/blocklist/gtkui.py:55
-#: deluge/plugins/blocklist/blocklist/gtkui.py:194
+#: deluge/plugins/blocklist/blocklist/gtkui.py:57
+#: deluge/plugins/blocklist/blocklist/gtkui.py:202
 msgid "Blocklist"
 msgstr ""
 
@@ -1831,48 +2714,46 @@ msgstr ""
 msgid "Not Connected"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:149
+#: deluge/ui/gtkui/statusbar.py:151
 msgid "Download Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:154
+#: deluge/ui/gtkui/statusbar.py:156
 msgid "Upload Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:159
+#: deluge/ui/gtkui/statusbar.py:161
 msgid "Protocol Traffic Download/Upload"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:167
+#: deluge/ui/gtkui/statusbar.py:169
 msgid "No Incoming Connections!"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:368 deluge/ui/gtkui/statusbar.py:396
-#: deluge/ui/gtkui/statusbar.py:423 deluge/ui/gtkui/systemtray.py:188
-#: deluge/ui/gtkui/systemtray.py:192 deluge/ui/gtkui/systemtray.py:334
-#: deluge/ui/gtkui/common.py:54 deluge/ui/webui/lib/newforms_plus.py:197
-#: deluge/ui/webui/lib/newforms_plus.py:216
-#: deluge/ui/webui/scripts/template_strings.py:115
+#: deluge/ui/gtkui/statusbar.py:372 deluge/ui/gtkui/statusbar.py:400
+#: deluge/ui/gtkui/statusbar.py:427 deluge/ui/gtkui/systemtray.py:190
+#: deluge/ui/gtkui/systemtray.py:194 deluge/ui/gtkui/systemtray.py:336
+#: deluge/ui/gtkui/common.py:54
 msgid "Unlimited"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/statusbar.py:398
-#: deluge/ui/gtkui/statusbar.py:425 deluge/ui/gtkui/systemtray.py:337
+#: deluge/ui/gtkui/statusbar.py:374 deluge/ui/gtkui/statusbar.py:402
+#: deluge/ui/gtkui/statusbar.py:429 deluge/ui/gtkui/systemtray.py:339
 #: deluge/ui/gtkui/common.py:111 deluge/ui/gtkui/common.py:112
 msgid "Other..."
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:372 deluge/ui/gtkui/systemtray.py:324
-#: deluge/ui/gtkui/menubar.py:404
+#: deluge/ui/gtkui/statusbar.py:376 deluge/ui/gtkui/systemtray.py:326
+#: deluge/ui/gtkui/menubar.py:424
 msgid "Set Maximum Download Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:400 deluge/ui/gtkui/systemtray.py:328
-#: deluge/ui/gtkui/menubar.py:405
+#: deluge/ui/gtkui/statusbar.py:404 deluge/ui/gtkui/systemtray.py:330
+#: deluge/ui/gtkui/menubar.py:425
 msgid "Set Maximum Upload Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/statusbar.py:427 deluge/ui/gtkui/menubar.py:406
+#: deluge/ui/gtkui/statusbar.py:431 deluge/ui/gtkui/menubar.py:426
 msgid "Set Maximum Connections"
 msgstr ""
 
@@ -1881,32 +2762,31 @@ msgid "Torrent"
 msgstr ""
 
 #: deluge/ui/gtkui/addtorrentdialog.py:93 deluge/ui/gtkui/files_tab.py:98
-#: deluge/ui/gtkui/createtorrentdialog.py:65
+#: deluge/ui/gtkui/createtorrentdialog.py:66
 msgid "Filename"
 msgstr ""
 
 #: deluge/ui/gtkui/addtorrentdialog.py:104 deluge/ui/gtkui/files_tab.py:118
-#: deluge/ui/gtkui/torrentview.py:137
-#: deluge/ui/gtkui/createtorrentdialog.py:75
-#: deluge/ui/webui/scripts/template_strings.py:102
+#: deluge/ui/gtkui/torrentview.py:153
+#: deluge/ui/gtkui/createtorrentdialog.py:76
 msgid "Size"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:496
+#: deluge/ui/gtkui/addtorrentdialog.py:503
 msgid "Choose a .torrent file"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:508
-#: deluge/ui/gtkui/createtorrentdialog.py:221
+#: deluge/ui/gtkui/addtorrentdialog.py:515
+#: deluge/ui/gtkui/createtorrentdialog.py:222
 msgid "Torrent files"
 msgstr ""
 
-#: deluge/ui/gtkui/addtorrentdialog.py:512
-#: deluge/ui/gtkui/createtorrentdialog.py:225
+#: deluge/ui/gtkui/addtorrentdialog.py:519
+#: deluge/ui/gtkui/createtorrentdialog.py:226
 msgid "All files"
 msgstr ""
 
-#: deluge/ui/gtkui/aboutdialog.py:58
+#: deluge/ui/gtkui/aboutdialog.py:55
 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 "
@@ -1919,33 +2799,36 @@ msgid ""
 "org/licenses>."
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:197
+#: deluge/ui/gtkui/systemtray.py:152
+msgid ""
+"Deluge\n"
+"Not Connected.."
+msgstr ""
+
+#: deluge/ui/gtkui/systemtray.py:199
 msgid "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:197
-#: deluge/ui/webui/scripts/template_strings.py:37
+#: deluge/ui/gtkui/systemtray.py:199
 msgid "Down"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:198
-#: deluge/ui/webui/scripts/template_strings.py:116
+#: deluge/ui/gtkui/systemtray.py:200
 msgid "Up"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:365
+#: deluge/ui/gtkui/systemtray.py:367
 msgid "Deluge is locked"
 msgstr ""
 
-#: deluge/ui/gtkui/systemtray.py:368
+#: deluge/ui/gtkui/systemtray.py:370
 msgid ""
 "Deluge is password protected.\n"
 "To show the Deluge window, please enter your password"
 msgstr ""
 
-#: deluge/ui/gtkui/files_tab.py:131 deluge/ui/gtkui/peers_tab.py:116
-#: deluge/ui/gtkui/torrentview.py:141
-#: deluge/ui/webui/scripts/template_strings.py:82
+#: deluge/ui/gtkui/files_tab.py:131 deluge/ui/gtkui/peers_tab.py:119
+#: deluge/ui/gtkui/torrentview.py:157
 msgid "Progress"
 msgstr ""
 
@@ -1966,35 +2849,30 @@ msgid "On"
 msgstr ""
 
 #: deluge/ui/gtkui/menubar.py:81
-#: deluge/ui/webui/scripts/template_strings.py:71
 msgid "Off"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:298
+#: deluge/ui/gtkui/menubar.py:318
 msgid "Choose a directory to move files to"
 msgstr ""
 
-#: deluge/ui/gtkui/menubar.py:407
+#: deluge/ui/gtkui/menubar.py:427
 msgid "Set Maximum Upload Slots"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:87
-#: deluge/ui/webui/scripts/template_strings.py:10
+#: deluge/ui/gtkui/peers_tab.py:90
 msgid "Address"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:103
-#: deluge/ui/webui/scripts/template_strings.py:19
+#: deluge/ui/gtkui/peers_tab.py:106
 msgid "Client"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:129 deluge/ui/gtkui/torrentview.py:155
-#: deluge/ui/webui/scripts/template_strings.py:38
+#: deluge/ui/gtkui/peers_tab.py:132 deluge/ui/gtkui/torrentview.py:171
 msgid "Down Speed"
 msgstr ""
 
-#: deluge/ui/gtkui/peers_tab.py:142 deluge/ui/gtkui/torrentview.py:159
-#: deluge/ui/webui/scripts/template_strings.py:117
+#: deluge/ui/gtkui/peers_tab.py:145 deluge/ui/gtkui/torrentview.py:175
 msgid "Up Speed"
 msgstr ""
 
@@ -2010,8 +2888,8 @@ msgstr ""
 #: deluge/ui/gtkui/notification.py:96
 #, python-format
 msgid ""
-"This email is to inform you that Deluge has finished downloading %"
-"s ,             which includes %i files.\n"
+"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"
@@ -2019,15 +2897,15 @@ msgid ""
 "Deluge"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:77 deluge/ui/gtkui/filtertreeview.py:99
+#: deluge/ui/gtkui/filtertreeview.py:76 deluge/ui/gtkui/filtertreeview.py:98
 msgid "Filters"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:134
+#: deluge/ui/gtkui/filtertreeview.py:133
 msgid "State"
 msgstr ""
 
-#: deluge/ui/gtkui/filtertreeview.py:214
+#: deluge/ui/gtkui/filtertreeview.py:213
 msgid "no label"
 msgstr ""
 
@@ -2039,11 +2917,11 @@ msgstr ""
 msgid " Torrent Queued"
 msgstr ""
 
-#: deluge/ui/gtkui/mainwindow.py:209
+#: deluge/ui/gtkui/mainwindow.py:212
 msgid "Down:"
 msgstr ""
 
-#: deluge/ui/gtkui/mainwindow.py:209
+#: deluge/ui/gtkui/mainwindow.py:212
 msgid "Up:"
 msgstr ""
 
@@ -2055,18 +2933,13 @@ msgstr ""
 msgid "Activated"
 msgstr ""
 
-#: deluge/ui/gtkui/signals.py:142
-msgid "Torrent is past stop ratio."
-msgstr ""
-
 #: deluge/ui/gtkui/edittrackersdialog.py:74
-#: deluge/ui/gtkui/createtorrentdialog.py:88
+#: deluge/ui/gtkui/createtorrentdialog.py:89
 msgid "Tier"
 msgstr ""
 
-#: deluge/ui/gtkui/edittrackersdialog.py:76 deluge/ui/gtkui/torrentview.py:179
-#: deluge/ui/gtkui/createtorrentdialog.py:90
-#: deluge/ui/webui/scripts/template_strings.py:111
+#: deluge/ui/gtkui/edittrackersdialog.py:76 deluge/ui/gtkui/torrentview.py:195
+#: deluge/ui/gtkui/createtorrentdialog.py:91
 msgid "Tracker"
 msgstr ""
 
@@ -2083,23 +2956,26 @@ msgid "Interface"
 msgstr ""
 
 #: deluge/ui/gtkui/preferences.py:61
-#: deluge/ui/webui/scripts/template_strings.py:74
 msgid "Other"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:142
+#: deluge/ui/gtkui/preferences.py:61
 msgid "Daemon"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:91
+#: deluge/ui/gtkui/preferences.py:61
 msgid "Proxy"
 msgstr ""
 
+#: deluge/ui/gtkui/preferences.py:61
+msgid "Notification"
+msgstr ""
+
 #: deluge/ui/gtkui/preferences.py:61
 msgid "Plugins"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:73 deluge/ui/webui/config_tabs_deluge.py:80
+#: deluge/ui/gtkui/preferences.py:73
 msgid "Enabled"
 msgstr ""
 
@@ -2107,959 +2983,80 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:779
+#: deluge/ui/gtkui/preferences.py:846
 msgid "Select the Plugin"
 msgstr ""
 
-#: deluge/ui/gtkui/preferences.py:790
+#: deluge/ui/gtkui/preferences.py:857
 msgid "Plugin Eggs"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:135
-#: deluge/ui/webui/scripts/template_strings.py:64
+#: deluge/ui/gtkui/torrentview.py:151
 msgid "Name"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:145
-#: deluge/ui/webui/scripts/template_strings.py:96
+#: deluge/ui/gtkui/torrentview.py:161
 msgid "Seeders"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:150 deluge/ui/webui/register_menu.py:40
-#: deluge/ui/webui/scripts/template_strings.py:79
+#: deluge/ui/gtkui/torrentview.py:166
 msgid "Peers"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:163
-#: deluge/ui/webui/scripts/template_strings.py:41
+#: deluge/ui/gtkui/torrentview.py:179
 msgid "ETA"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:167
-#: deluge/ui/webui/scripts/template_strings.py:85
+#: deluge/ui/gtkui/torrentview.py:183
 msgid "Ratio"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:171
+#: deluge/ui/gtkui/torrentview.py:187
 msgid "Avail"
 msgstr ""
 
-#: deluge/ui/gtkui/torrentview.py:175
+#: deluge/ui/gtkui/torrentview.py:191
 msgid "Added"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:117
+#: deluge/ui/gtkui/createtorrentdialog.py:118
 msgid "Choose a file"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:144
+#: deluge/ui/gtkui/createtorrentdialog.py:145
 msgid "Choose a folder"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:209
+#: deluge/ui/gtkui/createtorrentdialog.py:210
 msgid "Save .torrent file"
 msgstr ""
 
-#: deluge/ui/gtkui/createtorrentdialog.py:332
+#: deluge/ui/gtkui/createtorrentdialog.py:333
 #, python-format
 msgid "%.2f%%"
 msgstr ""
 
-#: deluge/ui/webui/render.py:169
-msgid "∞"
+#: deluge/ui/web/json_api.py:481
+msgid "Online"
 msgstr ""
 
-#: deluge/ui/webui/config_forms.py:90
-msgid "These changes were saved"
+#: deluge/ui/web/json_api.py:487 deluge/ui/web/json_api.py:491
+#: deluge/ui/web/json_api.py:501
+msgid "Offline"
 msgstr ""
 
-#: deluge/ui/webui/config_forms.py:96
-msgid "Correct the errors above and try again"
+#: deluge/ui/web/json_api.py:514
+msgid "Connected"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:31
-#: deluge/ui/webui/scripts/template_strings.py:20
-msgid "Config"
+#: deluge/ui/web/json_api.py:535
+msgid "Daemon doesn't exist"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:32
-#: deluge/ui/webui/scripts/template_strings.py:21
-msgid "Connect"
+#: deluge/ui/web/json_api.py:541
+msgid "Daemon not running"
 msgstr ""
 
-#: deluge/ui/webui/register_menu.py:33
-#: deluge/ui/webui/scripts/template_strings.py:5
-msgid "About"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:34
-#: deluge/ui/webui/scripts/template_strings.py:60
-msgid "Logout"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:36
-#: deluge/ui/webui/scripts/template_strings.py:105
-msgid "Statistics"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:37 deluge/ui/webui/register_menu.py:51
-#: deluge/ui/webui/scripts/template_strings.py:33
-msgid "Details"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:41
-#: deluge/ui/webui/scripts/template_strings.py:48
-msgid "Files"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:43
-msgid "Add"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:44
-msgid "Delete"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:45
-#: deluge/ui/webui/scripts/template_strings.py:106
-msgid "Stop"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:46
-#: deluge/ui/webui/scripts/template_strings.py:104
-msgid "Start"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:49
-msgid "Queue Top"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:50
-msgid "Queue Bottom"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:52
-#: deluge/ui/webui/scripts/template_strings.py:61
-msgid "Move"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:53
-msgid "Reannounce"
-msgstr ""
-
-#: deluge/ui/webui/register_menu.py:54
-msgid "Recheck"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:37
-msgid "Ports"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:38
-msgid "From"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:39
-msgid "To"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:40
-msgid "Random"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:68
-msgid "Extra's"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:69
-msgid "Mainline DHT"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:70
-msgid "UpNP"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:72
-msgid "Peer-Exchange"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:78
-msgid "Encryption"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:80
-msgid "Forced"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:80
-msgid "Disabled"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:81
-msgid "Handshake"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:81
-msgid "Either"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:83
-msgid "Inbound"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:84
-msgid "Outbound"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:85
-msgid "Level"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-#: deluge/ui/webui/scripts/template_strings.py:68
-msgid "None"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-msgid "Socksv4"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-msgid "Socksv5"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-msgid "Socksv5 W/ Auth"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-msgid "HTTP"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:93
-msgid "HTTP W/ Auth"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:95
-msgid "Type"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:96
-msgid "Host"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:97
-#: deluge/ui/webui/config_tabs_deluge.py:144
-#: deluge/ui/webui/config_tabs_webui.py:60
-msgid "Port"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:98
-msgid "Username"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:99
-#: deluge/ui/webui/config_tabs_webui.py:82
-#: deluge/ui/webui/scripts/template_strings.py:75
-msgid "Password"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:104
-msgid "Global"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:105
-#: deluge/ui/webui/config_tabs_deluge.py:121
-msgid "-1 = Unlimited"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:106
-#: deluge/ui/webui/config_tabs_deluge.py:122
-#: deluge/ui/webui/torrent_options.py:41 deluge/ui/webui/torrent_add.py:43
-msgid "Maximum Connections"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:107
-#: deluge/ui/webui/config_tabs_deluge.py:123
-msgid "Maximum Download Speed (Kib/s)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:108
-#: deluge/ui/webui/config_tabs_deluge.py:124
-msgid "Maximum Upload Speed (Kib/s)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:109
-#: deluge/ui/webui/config_tabs_deluge.py:125
-#: deluge/ui/webui/torrent_options.py:42 deluge/ui/webui/torrent_add.py:44
-msgid "Maximum Upload Slots"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:111
-msgid "Maximum Half-Open Connections"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:112
-msgid "Maximum Connection Attempts per Second"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:114
-msgid "Rate Limit IP Overhead"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:120
-msgid "Per Torrent"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:130
-#: deluge/ui/webui/scripts/template_strings.py:39
-msgid "Download"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:131
-msgid "Store all downoads in"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:132
-msgid "Save .torrent files to"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:133
-msgid "Auto Add folder"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:134
-msgid "Auto Add enabled"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:136 deluge/ui/webui/torrent_add.py:47
-msgid "Prioritize first and last pieces"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:143
-msgid "Restart daemon and webui after changing these settings"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:151
-msgid "-1 = unlimited"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:157
-msgid "Total active torrents"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:158
-msgid "Total active downloading"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:159
-msgid "Total active seeding"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:166
-msgid "Stop seeding when ratio reaches"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:168
-msgid "Remove torrent when ratio reached"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_deluge.py:188
-msgid "Enabled Plugins"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_plus.py:145
-msgid "This folder does not exist."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/django/utils/translation.py:2
-msgid "translate something"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/models.py:299
-#: deluge/ui/webui/lib/newforms_portable/fields.py:560
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/models.py:371
-#: deluge/ui/webui/lib/newforms_portable/fields.py:600
-#: deluge/ui/webui/lib/newforms_portable/fields.py:662
-msgid "Enter a list of values."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/models.py:372
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-msgid "Unknown"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-msgid "Yes"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/widgets.py:231
-msgid "No"
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:46
-msgid "This field is required."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:47
-msgid "Enter a valid value."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:124
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:125
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:152
-msgid "Enter a whole number."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:153
-#: deluge/ui/webui/lib/newforms_portable/fields.py:182
-#: deluge/ui/webui/lib/newforms_portable/fields.py:211
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:154
-#: deluge/ui/webui/lib/newforms_portable/fields.py:183
-#: deluge/ui/webui/lib/newforms_portable/fields.py:212
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:181
-#: deluge/ui/webui/lib/newforms_portable/fields.py:210
-msgid "Enter a number."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:213
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:214
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:215
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:263
-#: deluge/ui/webui/lib/newforms_portable/fields.py:751
-msgid "Enter a valid date."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:296
-#: deluge/ui/webui/lib/newforms_portable/fields.py:752
-msgid "Enter a valid time."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:335
-msgid "Enter a valid date/time."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:403
-msgid "Enter a valid e-mail address."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:433
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:434
-msgid "No file was submitted."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:435
-msgid "The submitted file is empty."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:459
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:497
-msgid "Enter a valid URL."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:498
-msgid "This URL appears to be a broken link."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:599
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-
-#: deluge/ui/webui/lib/newforms_portable/fields.py:780
-msgid "Enter a valid IPv4 address."
-msgstr ""
-
-#: deluge/ui/webui/pages.py:265
-msgid "refresh must be > 0"
-msgstr ""
-
-#: deluge/ui/webui/pages.py:316
-msgid "no uri"
-msgstr ""
-
-#: deluge/ui/webui/torrent_move.py:37
-msgid "Move To"
-msgstr ""
-
-#: deluge/ui/webui/torrent_move.py:64
-msgid "Error in Path."
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:41
-#: deluge/ui/webui/config_tabs_webui.py:47
-msgid "Template"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:44
-msgid "Text and image"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:44
-msgid "Image Only"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:45
-msgid "Text Only"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:48
-msgid "Button style"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:49
-msgid "Auto refresh (seconds)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:50
-msgid "Cache templates"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:57
-msgid "Server"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:58
-msgid "Manually restart webui to apply changes."
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:61
-msgid "Https"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:70
-#, python-format
-msgid "Certificate not found at '%s'"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:73
-#, python-format
-msgid "Key not found at '%s'"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:84
-msgid "Current Password"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:85
-msgid "New Password"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:86
-msgid "New Password (Confirm)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:93
-msgid "Old password is invalid"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:96
-msgid "New Password is not equal to New Password(confirm)"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:103
-msgid "Sidebar"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:104
-msgid "Show sidebar"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:105
-msgid "Show zero hits"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:106
-msgid "Show trackers"
-msgstr ""
-
-#: deluge/ui/webui/config_tabs_webui.py:107
-msgid "Show keyword search"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:38 deluge/ui/webui/torrent_add.py:40
-msgid "Maximum Down Speed"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:40 deluge/ui/webui/torrent_add.py:42
-msgid "Maximum Up Speed"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:49
-msgid "Stop seed at ratio"
-msgstr ""
-
-#: deluge/ui/webui/torrent_options.py:63 deluge/ui/webui/torrent_add.py:96
-msgid "Error in torrent options."
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:35
-msgid "Download Location"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:36
-msgid "Compact Allocation"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:48
-msgid "Add In Paused State"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:59
-msgid "Upload torrent"
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:110
-msgid "Choose an url or a torrent, not both."
-msgstr ""
-
-#: deluge/ui/webui/torrent_add.py:122
-msgid "No data"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:1
-msgid "# Of Files"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:2
-msgid "... and delete All files"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:3
-msgid "... and delete Downloaded files"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:4
-msgid "... and delete Torrent file"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:6
-msgid "Active time"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:11
-msgid "Admin"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:13
-msgid "Auto refresh:"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:14
-msgid "Ava"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:15
-msgid "Availability"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:16
-msgid "Bottom"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:17
-msgid "Cancel"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:18
-msgid "Clear"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:22
-msgid "Connect to Daemon"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:23
-msgid "Connected to"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:24
-msgid "Connection Limit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:27
-msgid "D/L Speed Limit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:28
-msgid "DHT Nodes"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:29
-msgid "Delete .torrent file"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:30
-msgid "Delete downloaded files."
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:31
-msgid "Deluge : Torrent List"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:32
-msgid "Deluge Login"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:34
-msgid "Disable"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:35
-msgid "Disk Space"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:36
-msgid "Do not download"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:40
-msgid "Downloaded"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:45
-msgid "Eta"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:46
-msgid "False"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:47
-msgid "File"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:49
-msgid "Filter on a keyword"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:50
-msgid "Force Recheck"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:51
-msgid "From Session"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:52
-msgid "From Url"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:53
-msgid "General"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:54
-msgid "High priority"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:55
-msgid "Highest priority"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:56
-msgid "Keyword"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:58
-msgid "Label torrent"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:59
-msgid "Login"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:63
-msgid "Move torrent"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:65
-msgid "Next Announce"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:66
-msgid "No Incoming Connections"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:67
-msgid "No Label"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:69
-msgid "Normal priority"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:70
-msgid "Not Connected to a daemon"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:72
-msgid "Ok"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:76
-msgid "Password is invalid,try again"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:78
-msgid "Pause all"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:80
-msgid "Pieces"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:84
-msgid "Queue Position"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:86
-msgid "Refresh page every:"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:87
-msgid "Remove"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:89
-msgid "Remove torrent"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:90
-msgid "Restart"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:92
-msgid "Resume all"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:93
-msgid "Save"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:94
-msgid "Search"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:95
-msgid "Seed rank"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:97
-msgid "Seeding time"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:98
-msgid "Select All"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:99
-msgid "Set"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:100
-msgid "Set Timeout"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:101
-msgid "Share Ratio"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:103
-msgid "Speed"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:107
-msgid "Submit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:108
-msgid "Top"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:109
-msgid "Torrent list"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:110
-msgid "Total Size"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:112
-msgid "Tracker Status"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:113
-msgid "True"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:114
-msgid "U/L Speed Limit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:118
-msgid "Update"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:119
-msgid "Update Tracker"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:120
-msgid "Upload"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:121
-msgid "Upload Slot Limit"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:122
-msgid "Uploaded"
-msgstr ""
-
-#: deluge/ui/webui/scripts/template_strings.py:123
-msgid "seconds"
+#: deluge/ui/web/server.py:401
+msgid "Starting server in PID"
 msgstr ""
diff --git a/deluge/ui/gtkui/glade/connection_manager.glade b/deluge/ui/gtkui/glade/connection_manager.glade
index bc4355610..af4129507 100644
--- a/deluge/ui/gtkui/glade/connection_manager.glade
+++ b/deluge/ui/gtkui/glade/connection_manager.glade
@@ -325,7 +325,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">gtk-refresh</property>
+                    <property name="label" translatable="no">gtk-refresh</property>
                     <property name="use_stock">True</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_button_refresh_clicked"/>
diff --git a/deluge/ui/gtkui/notification.py b/deluge/ui/gtkui/notification.py
index 8eda84ec7..c7d474197 100644
--- a/deluge/ui/gtkui/notification.py
+++ b/deluge/ui/gtkui/notification.py
@@ -93,9 +93,9 @@ class Notification:
         headers = "From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" % (
             self.config["ntf_email_add"], self.config["ntf_email_add"],
                 "Finished torrent %s" % (status["name"]))
-        text = _("This email is to inform you that Deluge has finished downloading %s , \
-            which includes %i files.\nTo stop receiving these alerts, simply turn off \
-            email notification in Deluge's preferences.\n\nThank you,\nDeluge") % (status["name"], status["num_files"])
+        text = _("This email is to inform you that Deluge has finished downloading %(name)s , \
+            which includes %(num_files)i files.\nTo stop receiving these alerts, simply turn off \
+            email notification in Deluge's preferences.\n\nThank you,\nDeluge") % {"name": status["name"], "num_files": status["num_files"]}
         message = headers + text
         if self.config["ntf_security"] == 'SSL':
             port = 465