Merge 2381..2382 from 0.5.x.

Report IOerror 13 on Linux as a port permission problem.
Clear up port permission text.
Error reporting equal porsts for https and http cannot be translated because translations are not available yet, use fixed English text instead.

Add some accented characters to the email test.

SABnzbd.py

@@ -538,7 +538,9 @@ def get_webhost(cherryhost, cherryport, https_port):
 
     if cherryport == https_port:
         sabnzbd.cfg.enable_https.set(False)
-        logging.error(Ta('error-sameHTTP-HTTPS'))
+        # Should have a translated message, but that's not available yet
+        #logging.error(Ta('error-sameHTTP-HTTPS'))
+        logging.error('HTTP and HTTPS ports cannot be the same')
 
     return cherryhost, cherryport, browserhost, https_port
 
@@ -1198,7 +1200,8 @@ def main():
                 exit_sab(2)
         else:
             logging.debug("Failed to start web-interface: ", exc_info = True)
-            Bail_Out(browserhost, cherryport)
+            # When error 13 occurs, we have no access rights
+            Bail_Out(browserhost, cherryport, '13' in str(error))
     except socket.error, error:
         logging.debug("Failed to start web-interface: ", exc_info = True)
         Bail_Out(browserhost, cherryport, access=True)

sabnzbd/interface.py

@@ -2558,9 +2558,9 @@ class ConnectionInfo:
         pack['download'] = ['action 1', 'action 2']
         pack['unpack'] = ['action 1', 'action 2']
 
-        self.__lastmail= emailer.endjob('T\xe9st Job', 123, 'unknown', True,
+        self.__lastmail= emailer.endjob('I had a d\xe8ja vu', 123, 'unknown', True,
-                                      os.path.normpath(os.path.join(cfg.complete_dir.get_path(), '/unknown/T\xe9st Job')),
+                                      os.path.normpath(os.path.join(cfg.COMPLETE_DIR.get_path(), '/unknown/I had a d\xe8ja vu')),
-                                      str(123*MEBI), pack, 'my_script', 'Line 1\nLine 2\nLin\xe9 3\n', 0)
+                                      str(123*MEBI), pack, 'my_script', 'Line 1\nLine 2\nLine 3\nd\xe8ja vu\n', 0)
         raise dcRaiser(self.__root, kwargs)
 
     @cherrypy.expose

sabnzbd/misc.py

@@ -475,8 +475,8 @@ MSG_BAD_PORT = r'''
 
 MSG_ILL_PORT = r'''
     SABnzbd needs a free tcp/ip port for its internal web server.<br>
-    Port %s on %s was tried , but the account SABnzbd has no permission to use it.<br>
+    Port %s on %s was tried , but the account used for SABnzbd has no permission to use it.<br>
-    On Linux systems, normal users must use ports above 1023.<br>
+    On OSX and Linux systems, normal users must use ports above 1023.<br>
     <br>
     Please restart SABnzbd with a different port number.<br>
     <br>