Fixed spelling in the source

4 files changed, 24 insertions, 24 deletions

diff --git a/pavement.py b/pavement.py
index ddb18afa4..da56fefbb 100644
--- a/pavement.py
+++ b/pavement.py
@@ -178,7 +178,7 @@ def sdist():
 def thrift(options):
     """ Generate Thrift stubs """
 
-    print "add import for TApplicationException manually as long it is not fixed"
+    print "add import for TApplicationException manually as long as it is not fixed"
 
     outdir = path("module") / "remote" / "thriftbackend"
     (outdir / "gen-py").rmtree()
diff --git a/pyLoadCli.py b/pyLoadCli.py
index d68b5faec..cf8fabd1a 100755
--- a/pyLoadCli.py
+++ b/pyLoadCli.py
@@ -402,13 +402,13 @@ def print_help(config):
     print "<Options>"
     print "  -i, --interactive", " Start in interactive mode"
     print
-    print "  -u, --username=", " " * 2, "Specify Username"
+    print "  -u, --username=", " " * 2, "Specify user name"
     print "  --pw=<password>", " " * 2, "Password"
-    print "  -a, --address=", " " * 3, "Specify address (current=%s)" % config["addr"]
-    print "  -p, --port", " " * 7, "Specify port (current=%s)" % config["port"]
+    print "  -a, --address=", " " * 3, "Use address (current=%s)" % config["addr"]
+    print "  -p, --port", " " * 7, "Use port (current=%s)" % config["port"]
     print
     print "  -l, --language", " " * 3, "Set user interface language (current=%s)" % config["language"]
-    print "  -h, --help", " " * 7, "Display this help screen"
+    print "  -h, --help", " " * 7, "Display this help text"
     print "  -c, --commands", " " * 3, "List all available commands"
     print
 
diff --git a/pyLoadCore.py b/pyLoadCore.py
index b129e2cb7..25b4c51c0 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -178,15 +178,15 @@ 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 "  --configdir=<dir>", " " * 6, "Run with <dir> as config directory"
+        print "  -s, --setup", " " * 12, "Run setup assistant"
+        print "  --configdir=<dir>", " " * 6, "Run with <dir> as configuration directory"
         print "  -p, --pidfile=<file>", " " * 3, "Set pidfile to <file>"
-        print "  --changedir", " " * 12, "Change config dir permanently"
-        print "  --daemon", " " * 15, "Daemonmize after start"
+        print "  --changedir", " " * 12, "Change configuration directory permanently"
+        print "  --daemon", " " * 15, "Daemonize after startup"
         print "  --no-remote", " " * 12, "Disable remote access (saves RAM)"
         print "  --status", " " * 15, "Display pid if running or False"
         print "  --clean", " " * 16, "Remove .pyc/.pyo files"
-        print "  -q, --quit", " " * 13, "Quit running pyLoad instance"
+        print "  -q, --quit", " " * 13, "Quit a running pyLoad instance"
         print "  -h, --help", " " * 13, "Display this help screen"
         print ""
 
@@ -288,7 +288,7 @@ class Core(object):
         if not exists("pyload.conf") and not tests:
             from module.setup import Setup
 
-            print "This is your first start, running configuration assistent now."
+            print "This is your first start, running configuration assistant now."
             self.config = ConfigParser()
             s = Setup(pypath, self.config)
             res = False
@@ -374,7 +374,7 @@ class Core(object):
 
         self.check_install("Crypto", _("pycrypto to decode container files"))
 
-        self.captcha = True # checks seems to fail, althoug tesseract is available
+        self.captcha = True # checks seems to fail, although tesseract is available
 
         if self.config['ssl']['activated']:
             self.check_install("OpenSSL", _("OpenSSL for secure connection"))
@@ -416,7 +416,7 @@ class Core(object):
         # enough initialization for test cases
         if tests: return
 
-        self.log.info(_("Downloadtime: %s") % self.api.isTimeDownload())
+        self.log.info(_("Download time: %s") % self.api.isTimeDownload())
 
         if rpc:
             self.remoteManager.startBackends()
@@ -512,7 +512,7 @@ class Core(object):
         console = logging.StreamHandler(sys.stdout)
         frm = logging.Formatter("%(asctime)s %(levelname)-8s  %(message)s", "%d.%m.%Y %H:%M:%S")
         console.setFormatter(frm)
-        self.log = logging.getLogger("log") # settable in config
+        self.log = logging.getLogger("log") # setable in config
 
         if not exists(self.config['log']['log_folder']):
             makedirs(self.config['log']['log_folder'], 0600)
@@ -538,7 +538,7 @@ class Core(object):
             h.close()
 
     def check_install(self, check_name, legend, python=True, essential=False):
-        """check wether needed tools are installed"""
+        """check whether needed tools are installed"""
         try:
             if python:
                 find_module(check_name)
@@ -591,7 +591,7 @@ class Core(object):
         self.deletePidFile()
 
     def shell(self):
-        """ stop and open a ipython shell inplace"""
+        """ stop and open an ipython shell inplace"""
         if self.debug:
             from IPython import embed
             sys.stdout = sys._stdout
@@ -662,7 +662,7 @@ def main():
             pyload_core.start()
         except KeyboardInterrupt:
             pyload_core.shutdown()
-            pyload_core.log.info(_("killed pyLoad from Terminal"))
+            pyload_core.log.info(_("killed pyLoad from terminal"))
             pyload_core.removeLogger()
             _exit(1)
 
diff --git a/systemCheck.py b/systemCheck.py
index b16704ac9..4b3c90753 100644
--- a/systemCheck.py
+++ b/systemCheck.py
@@ -50,7 +50,7 @@ def main():
     core_info = []
 
     if sys.version_info > (2, 8):
-        core_err.append("Your python version is to new, Please use Python 2.6/2.7")
+        core_err.append("Your python version is too new, Please use Python 2.6/2.7")
 
     if sys.version_info < (2, 5):
         core_err.append("Your python version is to old, Please use at least Python 2.5")
@@ -64,18 +64,18 @@ def main():
     try:
         from pycurl import AUTOREFERER
     except:
-        core_err.append("Your py-curl version is to old, please upgrade!")
+        core_err.append("Your py-curl version is too old, please upgrade!")
 
     try:
         import Image
     except:
-        core_err.append("Please install py-imaging/pil to use Hoster, which uses captchas.")
+        core_err.append("Please install py-imaging/pil to use Hoster, which use captchas.")
 
     pipe = subprocess.PIPE
     try:
         p = subprocess.call(["tesseract"], stdout=pipe, stderr=pipe)
     except:
-        core_err.append("Please install tesseract to use Hoster, which uses captchas.")
+        core_err.append("Please install tesseract to use Hoster, which use captchas.")
 
     try:
         import OpenSSL
@@ -102,7 +102,7 @@ def main():
     try:
         import flup
     except:
-        web_info.append("Install Flup to use FastCGI or optional webservers.")
+        web_info.append("Install Flup to use FastCGI or optional web servers.")
 
 
     if web_err:
@@ -110,10 +110,10 @@ def main():
         for err in web_err:
             print(err)
     else:
-        print("No Problems detected, Webinterface should work fine.")
+        print("No Problems detected, web interface should work fine.")
 
     if web_info:
-        print("\nPossible improvements for webinterface:\n")
+        print("\nPossible improvements for web interface:\n")
         for line in web_info:
             print(line)