summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/config/default.conf2
-rw-r--r--module/utils.py2
-rw-r--r--module/web/templates/500.html2
-rw-r--r--pyload.py6
4 files changed, 6 insertions, 6 deletions
diff --git a/module/config/default.conf b/module/config/default.conf
index af517f438..147cb915a 100644
--- a/module/config/default.conf
+++ b/module/config/default.conf
@@ -2,7 +2,7 @@ version: 1
remote - "Remote":
int port : "Port" = 7227
- ip listenaddr : "Adress" = 0.0.0.0
+ ip listenaddr : "Address" = 0.0.0.0
bool nolocalauth : "No authentication on local connections" = True
bool activated : "Activated" = True
ssl - "SSL":
diff --git a/module/utils.py b/module/utils.py
index 039f64c3a..5e8c2b12b 100644
--- a/module/utils.py
+++ b/module/utils.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-""" Store all usefull functions here """
+""" Store all useful functions here """
import os
import sys
diff --git a/module/web/templates/500.html b/module/web/templates/500.html
index e15090b66..5ca59fe09 100644
--- a/module/web/templates/500.html
+++ b/module/web/templates/500.html
@@ -5,6 +5,6 @@
<title>Server Error</title>
</head>
<body>
-<h1>Server Error occured. Please enable debug mode to get a more detailed report.</h1>
+<h1>Server Error occurred. Please enable debug mode to get a more detailed report.</h1>
</body>
</html>
diff --git a/pyload.py b/pyload.py
index 3ebda6842..5e62ed7d7 100644
--- a/pyload.py
+++ b/pyload.py
@@ -156,7 +156,7 @@ class Core(object):
#print " -a, --add=<link/list>", " " * 2, "Add the specified links"
print " -u, --user", " " * 13, "Manages users"
print " -d, --debug", " " * 12, "Enable debug mode"
- print " -s, --setup", " " * 12, "Run Setup Assistent"
+ print " -s, --setup", " " * 12, "Run Setup Assistant"
print " --configdir=<dir>", " " * 6, "Run with <dir> as config directory"
print " -p, --pidfile=<file>", " " * 3, "Set pidfile to <file>"
print " --changedir", " " * 12, "Change config dir permanently"
@@ -347,12 +347,12 @@ class Core(object):
self.log.debug("Remote activated: %s" % self.remote)
self.check_install("Crypto", _("pycrypto to decode container files"))
- #img = self.check_install("Image", _("Python Image Libary (PIL) for captcha reading"))
+ #img = self.check_install("Image", _("Python Image Library (PIL) for captcha reading"))
#self.check_install("pycurl", _("pycurl to download any files"), True, True)
self.check_file("tmp", _("folder for temporary files"), True)
#tesser = self.check_install("tesseract", _("tesseract for captcha reading"), False) if os.name != "nt" else True
- self.captcha = True # checks seems to fail, althoug tesseract is available
+ self.captcha = True # checks seems to fail, although tesseract is available
self.check_file(self.config['general']['download_folder'], _("folder for downloads"), True)