diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 9c3426471..90c4a97ca 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -1057,7 +1057,7 @@ class TorrentManager(component.Component): return # Set an Error message and pause the torrent alert_msg = decode_string(alert.message()).split(':', 1)[1].strip() - torrent.set_error_statusmsg("Failed to move storage: %s" % alert_msg) + torrent.set_error_statusmsg("Failed to move download folder: %s" % alert_msg) torrent.moving_storage = False torrent.pause() torrent.update_state() diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade index adde185ed..bf042d38e 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade @@ -251,7 +251,7 @@ it will be added to the session. True True False - Once the torrent is added to the session, + Once the torrent is added to the session, the .torrent will be deleted. False True @@ -273,7 +273,7 @@ the .torrent will be deleted. True True False - Once the torrent is added to the session, + Once the torrent is added to the session, an extension will be appended to the .torrent and it will remain in the same directory. False @@ -323,7 +323,7 @@ and it will remain in the same directory. True True False - Once the torrent is added to the session, + Once the torrent is added to the session, the .torrent will copied to the chosen directory and deleted from the watch folder. False @@ -378,7 +378,7 @@ and deleted from the watch folder. True False True - Once the torrent is deleted from the session, + Once the torrent is deleted from the session, also delete the .torrent file used to add it. False True @@ -438,11 +438,11 @@ also delete the .torrent file used to add it. False - Set download location + Set download folder True True False - This directory will be the download location + This folder will be where the torrent data is downloaded to. False True True @@ -502,7 +502,7 @@ also delete the .torrent file used to add it. True False - <b>Download Location</b> + <b>Download Folder</b> True @@ -533,7 +533,7 @@ also delete the .torrent file used to add it. False - Set move completed location + Set move completed folder True True False diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label.js b/deluge/plugins/Label/deluge/plugins/label/data/label.js index 1b3e4b476..c0a3b1199 100644 --- a/deluge/plugins/Label/deluge/plugins/label/data/label.js +++ b/deluge/plugins/Label/deluge/plugins/label/data/label.js @@ -206,7 +206,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, { }] }] }, { - title: _('Location'), + title: _('Folders'), items: [{ border: false, items: [{ @@ -218,7 +218,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, { xtype: 'checkbox', name: 'apply_move_completed', fieldLabel: '', - boxLabel: _('Apply location settings:'), + boxLabel: _('Apply folder settings:'), listeners: { check: this.onFieldChecked } diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade index fad82b187..f19ec6774 100644 --- a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade +++ b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade @@ -769,7 +769,7 @@ - Apply location settings: + Apply folder settings: True True False @@ -789,7 +789,7 @@ True False - Location + Folders 2 diff --git a/deluge/ui/console/commands/add.py b/deluge/ui/console/commands/add.py index a9003398c..e684a959d 100644 --- a/deluge/ui/console/commands/add.py +++ b/deluge/ui/console/commands/add.py @@ -1,46 +1,19 @@ -# -# add.py +# -*- coding: utf-8 -*- # # Copyright (C) 2008-2009 Ido Abramovich # Copyright (C) 2009 Andrew Resch # -# Deluge is free software. -# -# You may redistribute it and/or modify it under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 3 of the License, or (at your option) -# any later version. -# -# deluge is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with deluge. If not, write to: -# The Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301, USA. -# -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. -# +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. # + from twisted.internet import defer from deluge.ui.console.main import BaseCommand -import deluge.ui.console.colors as colors from deluge.ui.client import client import deluge.component as component import deluge.common -from deluge.ui.common import TorrentInfo from optparse import make_option import os @@ -48,14 +21,14 @@ import base64 from urllib import url2pathname from urlparse import urlparse + class Command(BaseCommand): """Add a torrent""" option_list = BaseCommand.option_list + ( - make_option('-p', '--path', dest='path', - help='save path for torrent'), + make_option('-p', '--path', dest='path', help='download folder for torrent'), ) - usage = "Usage: add [-p ] [ ...]\n"\ + usage = "Usage: add [-p ] [ ...]\n"\ " arguments can be file paths, URLs or magnet uris" def handle(self, *args, **options): @@ -70,6 +43,7 @@ class Command(BaseCommand): self.console.write("{!error!}Torrent was not added: Already in session") else: self.console.write("{!success!}Torrent added!") + def on_fail(result): self.console.write("{!error!}Torrent was not added: %s" % result) @@ -80,10 +54,12 @@ class Command(BaseCommand): continue if deluge.common.is_url(arg): self.console.write("{!info!}Attempting to add torrent from url: %s" % arg) - deferreds.append(client.core.add_torrent_url(arg, t_options).addCallback(on_success).addErrback(on_fail)) + deferreds.append(client.core.add_torrent_url(arg, t_options).addCallback(on_success).addErrback( + on_fail)) elif deluge.common.is_magnet(arg): self.console.write("{!info!}Attempting to add torrent from magnet uri: %s" % arg) - deferreds.append(client.core.add_torrent_magnet(arg, t_options).addCallback(on_success).addErrback(on_fail)) + deferreds.append(client.core.add_torrent_magnet(arg, t_options).addCallback(on_success).addErrback( + on_fail)) else: # Just a file if urlparse(arg).scheme == "file": @@ -98,9 +74,10 @@ class Command(BaseCommand): self.console.write("{!info!}Attempting to add torrent: %s" % path) filename = os.path.split(path)[-1] filedump = base64.encodestring(open(path, "rb").read()) - deferreds.append(client.core.add_torrent_file(filename, filedump, t_options).addCallback(on_success).addErrback(on_fail)) + deferreds.append(client.core.add_torrent_file(filename, filedump, t_options).addCallback( + on_success).addErrback(on_fail)) return defer.DeferredList(deferreds) def complete(self, line): - return component.get("ConsoleUI").tab_complete_path(line, ext=".torrent", sort="date") \ No newline at end of file + return component.get("ConsoleUI").tab_complete_path(line, ext=".torrent", sort="date") diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 2134c354c..ca71ac5e3 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -130,7 +130,7 @@ class DelugeHelpFormatter (optparse.IndentedHelpFormatter): "": "{!white!}%s{!input!}", "[_A-Z]{3,}": "{!cyan!}%s{!input!}", - "": "{!yellow!}%s{!input!}", + "": "{!yellow!}%s{!input!}", "": "{!green!}%s{!input!}" } diff --git a/deluge/ui/console/modes/addtorrents.py b/deluge/ui/console/modes/addtorrents.py index acda452c2..0b53e5721 100644 --- a/deluge/ui/console/modes/addtorrents.py +++ b/deluge/ui/console/modes/addtorrents.py @@ -485,7 +485,7 @@ class AddTorrents(BaseMode, component.Component): self.popup.add_text(msg) self.popup.add_spaces(1) - self.popup.add_text_input("Save Location:","location", dl) + self.popup.add_text_input("Download Folder:","location", dl) self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],[True,False],ap) diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.ui index f3000f3b6..aa6e3af56 100644 --- a/deluge/ui/gtkui/glade/add_torrent_dialog.ui +++ b/deluge/ui/gtkui/glade/add_torrent_dialog.ui @@ -391,7 +391,7 @@ True False - Download Location + Download Folder @@ -446,7 +446,7 @@ True False - Move Complete Location + Move Complete Folder diff --git a/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui b/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui index b066dc442..77edce787 100644 --- a/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui +++ b/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui @@ -48,7 +48,7 @@ - _Show In Folder + _Show True False False diff --git a/deluge/ui/web/js/deluge-all/MoveStorage.js b/deluge/ui/web/js/deluge-all/MoveStorage.js index 7515083b9..d79ff689f 100644 --- a/deluge/ui/web/js/deluge-all/MoveStorage.js +++ b/deluge/ui/web/js/deluge-all/MoveStorage.js @@ -64,7 +64,7 @@ Deluge.MoveStorage = Ext.extend(Ext.Window, { }); this.moveLocation = this.form.add({ - fieldLabel: _('Location'), + fieldLabel: _('Download Folder'), name: 'location', width: 240 }); diff --git a/deluge/ui/web/js/deluge-all/Statusbar.js b/deluge/ui/web/js/deluge-all/Statusbar.js index c3b41c8a9..cbd96d09a 100644 --- a/deluge/ui/web/js/deluge-all/Statusbar.js +++ b/deluge/ui/web/js/deluge-all/Statusbar.js @@ -213,7 +213,7 @@ Deluge.Statusbar = Ext.extend(Ext.ux.StatusBar, { text: ' ', cls: 'x-btn-text-icon', iconCls: 'x-deluge-freespace', - tooltip: _('Freespace in download location'), + tooltip: _('Freespace in download folder'), handler: function() { deluge.preferences.show(); deluge.preferences.selectPage('Downloads'); diff --git a/deluge/ui/web/js/deluge-all/add/OptionsTab.js b/deluge/ui/web/js/deluge-all/add/OptionsTab.js index ea1d6aaa3..a3fc04215 100644 --- a/deluge/ui/web/js/deluge-all/add/OptionsTab.js +++ b/deluge/ui/web/js/deluge-all/add/OptionsTab.js @@ -52,7 +52,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, { var fieldset = this.add({ xtype: 'fieldset', - title: _('Download Location'), + title: _('Download Folder'), border: false, autoHeight: true, defaultType: 'textfield', @@ -68,7 +68,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, { })); var fieldset = this.add({ xtype: 'fieldset', - title: _('Move Completed Location'), + title: _('Move Completed Folder'), border: false, autoHeight: true, defaultType: 'togglefield',