Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 4 files changed
  • 0 commit comments
  • 2 contributors
View
2  ChangeLog
@@ -5,6 +5,7 @@
* #1967: Fix unhandled IndexError when trying to open a non-json conf file
* Fix setting daemon listen interface from command line
* #2021: Fix share ratio limit not obeyed for seeded torrents added to session
+ * Add optparse custom version to prevent unnecessary loading of libtorrent
==== GtkUI ====
* #1918: Fix Drag'n'Drop not working in Windows
@@ -20,6 +21,7 @@
* Fix compatibility with Python 2.5
* Fix collapsed treeview in Create Torrent dialog
* Ignore unmaximise event when window isn't visible
+ * #1976: Fixed text entry with trailing newline characters causing issues for Move Storage
==== WebUI ====
* Fix Webui files-tab menu setting wrong priority
View
7 deluge/core/torrentmanager.py
@@ -877,7 +877,7 @@ def on_alert_torrent_finished(self, alert):
component.get("EventManager").emit(TorrentFinishedEvent(torrent_id))
- torrent.is_finished = torrent.handle.is_seed()
+ torrent.is_finished = True
torrent.update_state()
# Only save resume data if it was actually downloaded something. Helps
@@ -1007,6 +1007,11 @@ def on_alert_state_changed(self, alert):
old_state = torrent.state
torrent.update_state()
+
+ # Torrent may need to download data after checking.
+ if torrent.state == 'Checking':
+ torrent.is_finished = False
+
# Only emit a state changed event if the state has actually changed
if torrent.state != old_state:
component.get("EventManager").emit(TorrentStateChangedEvent(torrent_id, torrent.state))
View
532 deluge/i18n/deluge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Deluge 1.3.3\n"
"Report-Msgid-Bugs-To: http://deluge-torrent.org\n"
-"POT-Creation-Date: 2012-02-28 16:32+0000\n"
+"POT-Creation-Date: 2012-02-28 19:34+0000\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"
@@ -199,30 +199,30 @@ msgid "Hostname:"
msgstr ""
#: deluge/plugins/notifications/notifications/data/config.glade:194
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3330
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3514
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3698
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3884
-#: deluge/ui/gtkui/glade/connection_manager.glade:56
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3340
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3527
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3714
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3903
+#: deluge/ui/gtkui/glade/connection_manager.glade:57
msgid "Port:"
msgstr ""
#: deluge/plugins/notifications/notifications/data/config.glade:226
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3411
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3595
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3779
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3966
-#: deluge/ui/gtkui/glade/connection_manager.glade:143
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3422
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3609
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3796
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3986
+#: deluge/ui/gtkui/glade/connection_manager.glade:146
msgid "Username:"
msgstr ""
#: deluge/plugins/notifications/notifications/data/config.glade:250
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2114
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3278
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3462
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3646
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3830
-#: deluge/ui/gtkui/glade/connection_manager.glade:132
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2120
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3286
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3473
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3660
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3847
+#: deluge/ui/gtkui/glade/connection_manager.glade:135
msgid "Password:"
msgstr ""
@@ -235,8 +235,8 @@ msgid "Server requires TLS/SSL"
msgstr ""
#: deluge/plugins/notifications/notifications/data/config.glade:392
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:629
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:778
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:633
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:782
msgid "From:"
msgstr ""
@@ -275,9 +275,9 @@ msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:126
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:300
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:377
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:160
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:226
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:286
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:161
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:228
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:289
#: deluge/ui/gtkui/glade/main_window.glade:2026
#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:369
msgid "Select A Folder"
@@ -295,9 +295,9 @@ msgstr ""
#: deluge/plugins/extractor/extractor/data/extractor_prefs.glade:87
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:52
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2823
-#: deluge/ui/gtkui/glade/main_window.glade:2176
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:699
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2831
+#: deluge/ui/gtkui/glade/main_window.glade:2177
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:700
msgid "<b>General</b>"
msgstr ""
@@ -366,7 +366,7 @@ msgstr ""
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:26
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:381
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1010
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1011
msgid "URL:"
msgstr ""
@@ -384,7 +384,7 @@ msgstr ""
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:151
#: deluge/plugins/webui/webui/data/config.glade:92
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4143
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4163
msgid "<b>Settings</b>"
msgstr ""
@@ -409,15 +409,15 @@ msgid "Blocklist is up to date"
msgstr ""
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:290
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:470
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:474
msgid "<b>Options</b>"
msgstr ""
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:393
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3399
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3583
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3767
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3954
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3410
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3597
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3784
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3974
msgid "Type:"
msgstr ""
@@ -430,7 +430,7 @@ msgid "File Size:"
msgstr ""
#: deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade:437
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4789
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4809
msgid "<b>Info</b>"
msgstr ""
@@ -502,7 +502,7 @@ msgid "Set download location"
msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:319
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:392
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:393
msgid "<b>Download Location</b>"
msgstr ""
@@ -533,13 +533,13 @@ msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:533
#: deluge/ui/gtkui/glade/main_window.glade:1795
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:546
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:547
msgid "Max Connections:"
msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:550
#: deluge/ui/gtkui/glade/main_window.glade:1858
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:560
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:561
msgid "Max Upload Slots:"
msgstr ""
@@ -550,7 +550,7 @@ msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:683
#: deluge/ui/gtkui/glade/main_window.glade:1897
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:629
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:630
msgid "<b>Bandwidth</b>"
msgstr ""
@@ -587,13 +587,13 @@ msgid "Bottom"
msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1009
-#: deluge/ui/gtkui/glade/main_window.glade:2064
+#: deluge/ui/gtkui/glade/main_window.glade:2065
msgid "<b>Queue</b>"
msgstr ""
#: deluge/plugins/autoadd/autoadd/data/autoadd_options.glade:1029
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:625
-#: deluge/ui/gtkui/glade/connection_manager.glade:457
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:626
+#: deluge/ui/gtkui/glade/connection_manager.glade:460
msgid "Options"
msgstr ""
@@ -690,7 +690,7 @@ msgid "Queue"
msgstr ""
#: deluge/plugins/label/label/data/label_options.glade:453
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:202
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:204
msgid "Move completed to:"
msgstr ""
@@ -712,7 +712,7 @@ msgstr ""
#: deluge/plugins/label/label/data/label_options.glade:593
#: deluge/ui/gtkui/filtertreeview.py:69
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:463
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:464
msgid "Trackers"
msgstr ""
@@ -1789,7 +1789,7 @@ msgid "Daemon not running"
msgstr ""
#: deluge/ui/console/statusbars.py:104
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1065
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1071
msgid "DHT"
msgstr ""
@@ -2220,7 +2220,7 @@ msgid "Torrents"
msgstr ""
#: deluge/ui/gtkui/dialogs.py:174
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4697
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4717
msgid "Details:"
msgstr ""
@@ -2398,7 +2398,7 @@ msgid "<b>Add Trackers</b>"
msgstr ""
#: deluge/ui/gtkui/glade/edit_trackers.glade:296
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1204
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1207
msgid "Trackers:"
msgstr ""
@@ -2469,288 +2469,288 @@ msgstr ""
msgid "<b><i><big>Downloads</big></i></b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:186
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:188
msgid "Auto add .torrents from:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:251
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:254
msgid "Download to:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:259
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:262
msgid "Copy of .torrent files to:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:314
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:318
msgid "Delete copy of torrent file on remove"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:318
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:322
msgid "Delete the copy of the torrent file created when the torrent is removed"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:335
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:339
msgid "<b>Folders</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:368
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:372
msgid "Use Full Allocation"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:373
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:377
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:385
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:389
msgid "Use Compact Allocation"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:390
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:394
msgid "Compact allocation only allocates space as needed"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:407
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:467
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:411
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:468
msgid "<b>Allocation</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:438
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:442
msgid "Prioritize first and last pieces of torrent"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:443
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:447
msgid "Prioritize first and last pieces of files in torrent"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:453
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:457
msgid "Add torrents in Paused state"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:526
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:530
msgid "<b><i><big>Network</big></i></b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:565
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:758
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:569
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:762
msgid "Use Random Ports"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:570
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:574
msgid "Deluge will automatically choose a different port to use every time."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:588
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:592
msgid "Active Port:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:658
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:807
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:662
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:811
msgid "To:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:686
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:690
msgid "Test Active Port"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:728
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:732
msgid "<b>Incoming Ports</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:845
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:849
msgid "<b>Outgoing Ports</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:877
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:882
msgid ""
"Enter the IP address of the interface to listen for incoming bittorrent "
"connections on. Leave this empty if you want to use the default."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:898
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:903
msgid "<b>Interface</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:933
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:938
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:934
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:939
msgid "Peer TOS Byte:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:967
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:973
msgid "<b>TOS</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1000
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1006
msgid "UPnP"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1004
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1010
msgid "Universal Plug and Play"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1015
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1021
msgid "NAT-PMP"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1019
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1025
msgid "NAT Port Mapping Protocol"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1032
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1036
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1038
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1042
msgid "Peer Exchange"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1049
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1055
msgid "LSD"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1054
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1060
msgid "Local Service Discovery finds local peers on your network."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1069
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1075
msgid "Distributed hash table may improve the amount of active connections."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1091
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1097
msgid "<b>Network Extras</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1129
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1135
msgid "Inbound:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1139
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1145
msgid "Level:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1159
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1208
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1165
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1214
msgid ""
"Forced\n"
"Enabled\n"
"Disabled"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1170
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1176
msgid ""
"Handshake\n"
"Full Stream\n"
"Either"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1197
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1203
msgid "Outbound:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1224
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1230
msgid "Encrypt entire stream"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1249
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1255
msgid "<b>Encryption</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1309
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1315
msgid "<b><i><big>Bandwidth</big></i></b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1385
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1391
msgid "Maximum Connection Attempts per Second:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1397
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1403
msgid "Maximum Half-Open Connections:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1408
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1498
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1414
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1504
msgid "The maximum upload speed for all torrents. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1410
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1695
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1416
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1701
msgid "Maximum Upload Speed (KiB/s):"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1421
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1446
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1427
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1452
msgid "The maximum number of connections allowed. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1423
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1658
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1429
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1664
msgid "Maximum Connections:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1432
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1517
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1438
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1523
msgid "The maximum upload slots for all torrents. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1434
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1669
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1440
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1675
msgid "Maximum Upload Slots:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1464
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1479
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1470
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1485
msgid "The maximum download speed for all torrents. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1466
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1682
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1472
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1688
msgid "Maximum Download Speed (KiB/s):"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1543
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1549
msgid "Ignore limits on local network"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1562
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1568
msgid "Rate limit IP overhead"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1566
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1572
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:1583
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1589
msgid "<b>Global Bandwidth Usage</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1622
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1628
msgid "The maximum upload slots per torrent. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1641
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1707
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1725
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1647
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1713
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1731
msgid "The maximum number of connections per torrent. Set -1 for unlimited."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1747
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1753
msgid "<b>Per Torrent Bandwidth Usage</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1806
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1812
msgid "<i><b><big>Interface</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1839
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1845
msgid "Enable"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1844
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1850
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 "
@@ -2758,199 +2758,199 @@ msgid ""
"setting to take effect."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1854
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1860
msgid "<b>Classic Mode</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1886
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1892
msgid "Show session speed in titlebar"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1904
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1910
msgid "<b>Main Window</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1936
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1942
msgid "Always show"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1954
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1960
msgid "Bring the dialog to focus"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1974
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1980
msgid "<b>Add Torrents Dialog</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2005
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2011
msgid "Enable system tray icon"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2023
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2029
msgid "Minimize to tray on close"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2043
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2049
msgid "Start in tray"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2063
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2069
msgid "Enable Application Indicator"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2084
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2090
msgid "Password protect system tray"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2150
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2157
msgid "<b>System Tray</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2208
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2215
msgid "<i><b><big>Other</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2248
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2255
msgid "Be alerted about new releases"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2253
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2260
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:2272
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2279
msgid "<b>Updates</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2308
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2315
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:2325
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2332
msgid "Yes, please send anonymous statistics"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2347
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2354
msgid "<b>System Information</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2389
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2396
msgid "Location:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2401
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2409
msgid ""
"If Deluge cannot find the database file at this location it will fallback to "
"using DNS to resolve the peer's country."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2425
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2433
msgid "<b>GeoIP Database</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2470
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2478
msgid "Associate Magnet links with Deluge"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2538
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2546
msgid "<i><b><big>Daemon</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2581
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2589
msgid "Daemon port:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2618
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2626
msgid "<b>Port</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2647
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2655
msgid "Allow Remote Connections"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2661
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2669
msgid "<b>Connections</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2690
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2698
msgid "Periodically check the website for new releases"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2704
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2712
msgid "<b>Other</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2763
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2771
msgid "<i><b><big>Queue</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2804
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2812
msgid "Queue new torrents to top"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2898
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2906
msgid "Total active seeding:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2911
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2919
msgid "Total active:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2940
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2948
msgid "Total active downloading:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2955
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2963
msgid "Do not count slow torrents"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:2973
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:2981
msgid "<b>Active Torrents</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3014
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3022
msgid "Share Ratio Limit:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3024
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3032
msgid "Seed Time Ratio:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3036
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3044
msgid "Seed Time (m):"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3104
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3112
msgid "Stop seeding when share ratio reaches:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3149
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3157
msgid "Remove torrent when share ratio reached"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3171
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3179
msgid "<b>Seeding</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3235
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3243
msgid "<i><b><big>Proxy</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3305
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3489
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3673
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3858
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3314
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3501
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3688
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3876
msgid "Host:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3379
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3563
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3747
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3934
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3390
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3577
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3764
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3954
msgid ""
"None\n"
"Socksv4\n"
@@ -2960,166 +2960,166 @@ msgid ""
"HTTP W/ Auth"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3426
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3437
msgid "<b>Peer</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3610
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3624
msgid "<b>Web Seed</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3794
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:3811
msgid "<b>Tracker</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:3982
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4002
msgid "<b>DHT</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4038
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4058
msgid "<b><i><big>Cache</big></i></b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4082
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4102
msgid "Cache Size (16 KiB blocks):"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4092
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4112
msgid ""
"The number of seconds from the last cached write to a piece in the write "
"cache, to when it's forcefully flushed to disk. Default is 60 seconds."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4094
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4114
msgid "Cache Expiry (seconds):"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4189
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4209
msgid ""
"The total number of 16 KiB blocks written to disk since this session was "
"started."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4191
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4211
msgid "Blocks Written:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4200
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4220
msgid ""
"The total number of write operations performed since this session was "
"started."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4202
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4222
msgid "Writes:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4213
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4233
msgid ""
"The ratio (blocks_written - writes) / blocks_written represents the number "
"of saved write operations per total write operations, i.e. a kind of cache "
"hit ratio for the write cache."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4215
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4235
msgid "Write Cache Hit Ratio:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4267
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4287
msgid "<b>Write</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4297
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4317
msgid ""
"The number of blocks that were requested from the bittorrent engine (from "
"peers), that were served from disk or cache."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4299
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4319
msgid "Blocks Read:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4308
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4328
msgid "The number of blocks that were served from cache."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4310
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4330
msgid "Blocks Read Hit:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4321
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4341
msgid "The cache hit ratio for the read cache."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4323
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4343
msgid "Read Cache Hit Ratio:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4372
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4392
msgid ""
"The total number of read operations performed since this session was started."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4374
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4394
msgid "Reads:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4401
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4421
msgid "<b>Read</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4431
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4451
msgid ""
"The number of 16 KiB blocks currently in the disk cache. This includes both "
"read and write cache."
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4433
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4453
msgid "Cache Size:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4443
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4463
msgid "Read Cache Size:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4482
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4502
msgid "<b>Size</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4525
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4545
msgid "<b>Status</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4586
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4606
msgid "<i><b><big>Plugins</big></b></i>"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4710
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4730
msgid "Version:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4723
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4743
#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:264
msgid "Author:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4734
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4754
msgid "Homepage:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4747
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4767
msgid "Author Email:"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4839
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4859
msgid "_Install Plugin"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4882
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4902
msgid "_Rescan Plugins"
msgstr ""
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:4935
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:4955
msgid "_Find More Plugins"
msgstr ""
@@ -3161,23 +3161,23 @@ msgstr ""
msgid "<b>Files</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:293
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:294
msgid "Comments:"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:332
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:333
msgid "Info"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:513
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:514
msgid "Webseeds"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:543
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:544
msgid "Piece Size:"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:553
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:554
msgid ""
"32 KiB\n"
"64 KiB\n"
@@ -3191,36 +3191,36 @@ msgid ""
"16 MiB\n"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:581
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:582
msgid "Set Private Flag"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:595
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:596
msgid "Add this torrent to the session"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:693
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:694
msgid "Enter Remote Path"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:729
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:730
msgid "<b>Remote Path</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:763
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:945
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:764
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:947
msgid "Path:"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:838
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:840
msgid "Creating Torrent"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:875
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:877
msgid "Save .torrent as"
msgstr ""
-#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:911
+#: deluge/ui/gtkui/glade/create_torrent_dialog.glade:913
msgid "<b>Save .torrent file</b>"
msgstr ""
@@ -3228,29 +3228,29 @@ msgstr ""
msgid "Add Host"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:204
+#: deluge/ui/gtkui/glade/connection_manager.glade:207
#: deluge/ui/gtkui/glade/main_window.glade:454
#: deluge/ui/gtkui/glade/main_window.glade:455
msgid "Connection Manager"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:237
+#: deluge/ui/gtkui/glade/connection_manager.glade:240
msgid "<big><b>Connection Manager</b></big>"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:363
+#: deluge/ui/gtkui/glade/connection_manager.glade:366
msgid "_Start local daemon"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:415
+#: deluge/ui/gtkui/glade/connection_manager.glade:418
msgid "Automatically connect to selected host on start-up"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:426
+#: deluge/ui/gtkui/glade/connection_manager.glade:429
msgid "Automatically start localhost if needed"
msgstr ""
-#: deluge/ui/gtkui/glade/connection_manager.glade:440
+#: deluge/ui/gtkui/glade/connection_manager.glade:443
msgid "Do not show this dialog on start-up"
msgstr ""
@@ -3518,77 +3518,77 @@ msgstr ""
msgid "Move completed:"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2098
+#: deluge/ui/gtkui/glade/main_window.glade:2099
msgid "Private"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2113
+#: deluge/ui/gtkui/glade/main_window.glade:2114
msgid "Prioritize First/Last"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2151
+#: deluge/ui/gtkui/glade/main_window.glade:2152
#: deluge/ui/gtkui/glade/torrent_menu.glade:130
msgid "_Edit Trackers"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2258
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:861
+#: deluge/ui/gtkui/glade/main_window.glade:2259
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:862
msgid "_Options"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2278
+#: deluge/ui/gtkui/glade/main_window.glade:2279
msgid "Remove Torrent?"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2315
+#: deluge/ui/gtkui/glade/main_window.glade:2316
msgid "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2367
+#: deluge/ui/gtkui/glade/main_window.glade:2368
msgid "<i>The associated .torrent will be deleted!</i>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2407
+#: deluge/ui/gtkui/glade/main_window.glade:2408
msgid "<i>The downloaded data will be deleted!</i>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2451
+#: deluge/ui/gtkui/glade/main_window.glade:2452
msgid "Remove Selected Torrent"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2475
+#: deluge/ui/gtkui/glade/main_window.glade:2476
msgid "New Release"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2507
+#: deluge/ui/gtkui/glade/main_window.glade:2508
msgid "<b><big>New Release Available!</big></b>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2559
+#: deluge/ui/gtkui/glade/main_window.glade:2560
msgid "<i>Available Version:</i>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2582
+#: deluge/ui/gtkui/glade/main_window.glade:2583
msgid "<i>Current Version:</i>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2593
+#: deluge/ui/gtkui/glade/main_window.glade:2594
msgid "<i>Server Version</i>"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2626
+#: deluge/ui/gtkui/glade/main_window.glade:2627
msgid "Do not show this dialog in the future"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2665
+#: deluge/ui/gtkui/glade/main_window.glade:2666
msgid "_Goto Website"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2693
+#: deluge/ui/gtkui/glade/main_window.glade:2694
msgid "_Add Peer"
msgstr ""
-#: deluge/ui/gtkui/glade/main_window.glade:2695
+#: deluge/ui/gtkui/glade/main_window.glade:2696
msgid "Add a peer by its IP"
msgstr ""
@@ -3672,55 +3672,55 @@ msgstr ""
msgid "Fi_les"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:429
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:430
msgid "Full"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:445
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:446
msgid "Compact"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:520
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:521
msgid "Max Down Speed:"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:532
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:533
msgid "Max Up Speed:"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:662
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:663
msgid "Add In _Paused State"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:678
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:679
msgid "Prioritize First/Last Pieces"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:756
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:757
msgid "Revert To Defaults"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:810
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:811
msgid "Apply To All"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:938
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:939
msgid "Add URL"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:975
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:976
msgid "<b>From URL</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1096
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1098
msgid "Add Infohash"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1133
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1135
msgid "<b>From Infohash</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1168
+#: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1170
msgid "Infohash:"
msgstr ""
@@ -3736,7 +3736,7 @@ msgstr ""
msgid "<b>Add Peer</b>"
msgstr ""
-#: deluge/ui/gtkui/glade/dgtkpopups.glade:211
+#: deluge/ui/gtkui/glade/dgtkpopups.glade:212
msgid "hostname:port"
msgstr ""
View
20 deluge/plugins/blocklist/blocklist/core.py
@@ -59,7 +59,7 @@
# TODO: review class attributes for redundancy
DEFAULT_PREFS = {
- "url": "http://deluge-torrent.org/blocklist/nipfilter.dat.gz",
+ "url": "",
"load_on_start": False,
"check_after_days": 4,
"list_compression": "",
@@ -97,12 +97,13 @@ def enable(self):
update_now = False
if self.config["load_on_start"]:
self.pause_session()
- if self.config["last_update"]:
- last_update = datetime.fromtimestamp(self.config["last_update"])
- check_period = timedelta(days=self.config["check_after_days"])
- if not self.config["last_update"] or last_update + check_period < datetime.now():
- update_now = True
- else:
+ if self.config["check_after_days"] > 0:
+ if self.config["last_update"]:
+ last_update = datetime.fromtimestamp(self.config["last_update"])
+ check_period = timedelta(days=self.config["check_after_days"])
+ if not self.config["last_update"] or last_update + check_period < datetime.now():
+ update_now = True
+ if not update_now:
d = self.import_list(deluge.configmanager.get_config_dir("blocklist.cache"))
d.addCallbacks(self.on_import_complete, self.on_import_error)
if self.need_to_resume_session:
@@ -110,8 +111,9 @@ def enable(self):
# This function is called every 'check_after_days' days, to download
# and import a new list if needed.
- self.update_timer = LoopingCall(self.check_import)
- self.update_timer.start(self.config["check_after_days"] * 24 * 60 * 60, update_now)
+ if self.config["check_after_days"] > 0:
+ self.update_timer = LoopingCall(self.check_import)
+ self.update_timer.start(self.config["check_after_days"] * 24 * 60 * 60, update_now)
def disable(self):
self.config.save()

No commit comments for this range

Something went wrong with that request. Please try again.