From d7975a870b53c68024abd8e12837452cc6b7031a Mon Sep 17 00:00:00 2001
From: rlx <rlx@rolux.org>
Date: Sat, 16 Jan 2016 20:13:54 +0530
Subject: [PATCH] update strings

---
 install       | 10 +++++-----
 oml/update.py | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/install b/install
index 2e9d65c..31df20f 100755
--- a/install
+++ b/install
@@ -35,8 +35,8 @@ class Install(Thread):
                 try:
                     from OpenSSL.SSL import TLSv1_2_METHOD
                 except:
-                    print("To run Open Media Library on versions of Ubuntu before 15.10 you need to manually update pyOpenSSL")
-                    print("To install the current version of pyOpenSSL:\n\tsudo apt-get install python3-pip python3-dev libffi-dev libssl-dev\n\tsudo pip3 install -U pyOpenSSL")
+                    print("To run Open Media Library on versions of Ubuntu before 15.10, you need to manually update pyOpenSSL.")
+                    print("To install the current version of pyOpenSSL, run:\n\tsudo apt-get install python3-pip python3-dev libffi-dev libssl-dev\n\tsudo pip3 install -U pyOpenSSL")
                     self.failed = True
                     return
             apt_packages = ''
@@ -87,8 +87,8 @@ class Install(Thread):
             elif apt_packages:
                 print('You need to install Pillow, lxml and pyOpenSSL\ni.e. sudo pip3 install pillow lxml pyOpenSSL')
                 if 'poppler' in apt_packages:
-                    print('You need to install pdftocairo (part of poppler-utils)')
-                print("After installing those packages, run install again")
+                    print('You need to install pdftocairo (part of poppler-utils).')
+                print("After installing these packages, run install again.")
                 self.failed = True
                 return
         target = self.target
@@ -170,5 +170,5 @@ if __name__ == '__main__':
     install = Install(target)
     install.join()
     if not install.failed:
-        print("to launch Open Media Library run: %s open"%os.path.join(target, 'ctl'))
+        print("To launch Open Media Library, run: %s open"%os.path.join(target, 'ctl'))
         #subprocess.Popen([os.path.join(target, 'ctl'), 'open'])
diff --git a/oml/update.py b/oml/update.py
index a0c5063..0d40fd8 100644
--- a/oml/update.py
+++ b/oml/update.py
@@ -263,21 +263,21 @@ class Update(Thread):
 
     def install(self):
         while update_available():
-            self.status('Downloading new version...')
+            self.status('Downloading...')
             while not download():
-                self.status('Download failed... (try again in 10 seconds)')
-                time.sleep(10)
-                self.status('Downloading new version...')
-            self.status('Installing new version...')
+                self.status('Download failed, retrying...')
+                time.sleep(5)
+                self.status('Downloading...')
+            self.status('Installing...')
             if not install(False):
-                self.status('Installation failed...')
+                self.status('Installation failed.')
             return True
         return False
 
     def update_database(self):
         db_version = settings.server.get('db_version', 0)
         if db_version < settings.DB_VERSION:
-            self.status('Migrating database...')
+            self.status('Updating...')
             if db_version < 1:
                 db_version = migrate_1()
             if db_version < 2:
@@ -285,7 +285,7 @@ class Update(Thread):
             settings.server['db_version'] = settings.DB_VERSION
 
     def run(self):
-        self.status('Checking for Updates...')
+        self.status('Checking for updates...')
         self.update_database()
         if self.install():
             restart_oml()