diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-09-28 21:19:03 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-09-28 21:19:03 +0200 |
commit | 46c6fc74a4e423927554f024b78dbbbf33e982cd (patch) | |
tree | e7ff9580bb5e80b91e2bd9609409116a19c5941e /pyload/plugins/hooks/ClickAndLoad.py | |
parent | Api : Add brackets and pipe to urlmatcher (diff) | |
parent | [XFileSharingPro] Fixed typo (diff) | |
download | pyload-46c6fc74a4e423927554f024b78dbbbf33e982cd.tar.xz |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugins/crypter/MultiuploadCom.py
pyload/plugins/crypter/SerienjunkiesOrg.py
pyload/plugins/hooks/ExternalScripts.py
pyload/plugins/hooks/ExtractArchive.py
pyload/plugins/hooks/MergeFiles.py
pyload/plugins/hoster/CatShareNet.py
pyload/plugins/hoster/FilezyNet.py
pyload/plugins/hoster/IFileWs.py
pyload/plugins/hoster/PremiumTo.py
pyload/plugins/hoster/SpeedyshareCom.py
pyload/plugins/hoster/UptoboxCom.py
pyload/plugins/hoster/XFileSharingPro.py
pyload/plugins/hoster/ZippyshareCom.py
Diffstat (limited to 'pyload/plugins/hooks/ClickAndLoad.py')
-rw-r--r-- | pyload/plugins/hooks/ClickAndLoad.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyload/plugins/hooks/ClickAndLoad.py b/pyload/plugins/hooks/ClickAndLoad.py index 47163ceef..501845840 100644 --- a/pyload/plugins/hooks/ClickAndLoad.py +++ b/pyload/plugins/hooks/ClickAndLoad.py @@ -30,7 +30,7 @@ class ClickAndLoad(Hook): thread.start_new_thread(proxy, (self, ip, self.port, 9666)) except: - self.logError("ClickAndLoad port already in use.") + self.logError(_("ClickAndLoad port already in use")) def proxy(self, *settings): |