diff -Nru sshsplit-0.3/bin/sshsplit sshsplit-0.4/bin/sshsplit
--- sshsplit-0.3/bin/sshsplit	2010-03-01 15:49:43.000000000 +0000
+++ sshsplit-0.4/bin/sshsplit	2010-03-25 19:13:27.000000000 +0000
@@ -22,8 +22,8 @@
 
 
 __author__="Martin Eve"
-__date__ ="$Feb 14, 2010 4:31:58 PM$"
-__version__ = "1.0"
+__date__ ="$Mar 06, 2010$"
+__version__ = "0.4"
 
 import select
 import socket
@@ -41,6 +41,10 @@
 from twisted.internet import reactor
 import gtk
 
+import gettext
+from gettext import gettext as _
+gettext.textdomain('sshsplit')
+
 # Check if we are working in the source tree or from the installed
 # package and mangle the python path accordingly
 if os.path.dirname(sys.argv[0]) != ".":
@@ -153,6 +157,7 @@
         ui_filename = None
 
     builder = gtk.Builder()
+    builder.set_translation_domain('sshsplit')
     builder.add_from_file(ui_filename)
     window = builder.get_object("sshsplit_window")
     window.finish_initializing(builder)
@@ -235,6 +240,8 @@
 
             self.p.poll()
 
+            time.sleep(10)
+
         if self.verbose:
             print "Child process died."
 
@@ -275,7 +282,7 @@
         if self.verbose:
             print "Starting", instanceCount, "SSH instances."
 
-        portRange = range(startPort, startPort + instanceCount)
+        portRange = range(int(startPort), int(startPort) + int(instanceCount))
 
         for port in portRange:
 
@@ -349,43 +356,10 @@
                                     SSHInstances)
 
         # 8007 is the port you want to run under. Choose something >1024
-        reactor.listenTCP(54321, factory)
+        reactor.listenTCP(int(self.port), factory)
         reactor.run()
 
-        input = [sys.stdin]
-        running = 1
-        while running:
-            inputready,outputready,exceptready = select.select(input,[],[])
-
-            for s in inputready:
-
-                if s == sys.stdin:
-                    # handle standard input
-                    junk = sys.stdin.readline()
-                    running = 0
-
-        if self.options.verbose:
-            print "Shutting down SSH...";
-
-        # shutdown the SSH instances
-        SSHInstances.shutdown()
-
-        if self.options.verbose:
-            print "Shutting down server...";
-
-        if self.options.verbose:
-            print "Shutting down clients...";
-
-        try:
-            reactor.stop()
-        except:
-            pass
-
-        if self.options.verbose:
-            print "Term.";
-            
-        sys.exit(1)
-
+        
     def remove_instance(self, client):
         self.threads.remove(client)
 
@@ -423,8 +397,9 @@
     if os.fork() == 0:
         os.setsid()
         if os.fork() == 0:
-            open_logfile()
-            write_pidfile()
+            # open_logfile()
+            # write_pidfile()
+	    pass
         else:
             os._exit(0)
     else:
@@ -435,60 +410,60 @@
     gpl_intro()
 
     # command line parser
-    usage = "usage: %prog \t[-a] [-b binary] [-d] [-H listenhost] "\
+    usage = _("usage: %prog \t[-a] [-b binary] [-d] [-H listenhost] "\
         "[-i instancecount]\n"\
-        "\t\t\t[-l listenport] [-r minstorestart] [-s port] [-S] [-v] <host>"
+        "\t\t\t[-l listenport] [-r minstorestart] [-s port] [-S] [-v] <host>")
     parser = OptionParser(usage=usage, version="%prog " + __version__)
 
     # output options
-    opergroup = OptionGroup(parser, "Output parameters")
+    opergroup = OptionGroup(parser, _("Output parameters"))
     opergroup.add_option("-d", "--daemon", dest="daemon",
-                      action="store_true", help="run in background",
+                      action="store_true", help=_("run in background"),
                       default=False)
     opergroup.add_option("-v", "--verbose",
                       action="store_true", dest="verbose", default=False,
-                      help="print status messages to stdout. When used with "\
-                      "-d, messages will be logged to ssh-split.log.")
+                      help=_("print status messages to stdout. When used with "\
+                      "-d, messages will be logged to ssh-split.log."))
     parser.add_option_group(opergroup)
 
     # host options
-    hostgroup = OptionGroup(parser, "Host options")
+    hostgroup = OptionGroup(parser, _("Host options"))
     hostgroup.add_option("-H", "--listenhost",
                       action="store", dest="listenhost", default="127.0.0.1",
-                      help="listen on HOST "\
-                      "[default: %default]", metavar="HOST")
+                      help=_("listen on HOST "\
+                      "[default: %default]"), metavar="HOST")
     hostgroup.add_option("-l", "--listenport",
                       action="store", dest="listenport", default=54321,
-                      help="listen on PORT "\
-                      "[default: %default]", metavar="PORT")
+                      help=_("listen on PORT "\
+                      "[default: %default]"), metavar="PORT")
     parser.add_option_group(hostgroup)
 
     # subprocess options
-    subprocgroup = OptionGroup(parser, "Subprocess options")
+    subprocgroup = OptionGroup(parser, _("Subprocess options"))
     subprocgroup.add_option("-a", "--procargs",
                       action="store", dest="procargs", default="",
-                      help="pass ARGS to executable (quote encapsulate)"\
-                      "[default: %default]", metavar="ARGS")
+                      help=_("pass ARGS to executable (quote encapsulate)"\
+                      "[default: %default]"), metavar="ARGS")
     subprocgroup.add_option("-b", "--bin",
                       action="store", dest="bin", default="ssh",
-                      help="multiplex executable BIN "\
-                      "[default: %default]", metavar="BIN")
+                      help=_("multiplex executable BIN "\
+                      "[default: %default]"), metavar="BIN")
     subprocgroup.add_option("-i", "--instancecount",
                       action="store", dest="instancecount", default=5,
-                      help="multiplex NUM instances "\
-                      "[default: %default]", metavar="NUM")
+                      help=_("multiplex NUM instances "\
+                      "[default: %default]"), metavar="NUM")
     subprocgroup.add_option("-r", "--restarttime",
                       action="store", dest="restarttime", type="int",default=-1,
-                      help="restart subprocesses after MINS (-1 to disable) "\
-                      "[default: %default]", metavar="MINS")
+                      help=_("restart subprocesses after MINS (-1 to disable) "\
+                      "[default: %default]"), metavar="MINS")
     subprocgroup.add_option("-s", "--startport",
                       action="store", dest="startport", default=54322,
-                      help="start port range at PORT "\
-                      "[default: %default]", metavar="PORT")
+                      help=_("start port range at PORT "\
+                      "[default: %default]"), metavar="PORT")
     subprocgroup.add_option("-S", "--suppressinbuiltargs",
                       action="store_true", dest="suppress", default=False,
-                      help="suppress passing -ND <port> to executable "\
-                      "[default: %default]")
+                      help=_("suppress passing -ND <port> to executable "\
+                      "[default: %default]"))
     parser.add_option_group(subprocgroup)
 
     # get options and args from the parser
diff -Nru sshsplit-0.3/data/ui/AboutSshsplitDialog.ui sshsplit-0.4/data/ui/AboutSshsplitDialog.ui
--- sshsplit-0.3/data/ui/AboutSshsplitDialog.ui	2010-03-01 13:49:22.000000000 +0000
+++ sshsplit-0.4/data/ui/AboutSshsplitDialog.ui	2010-03-25 17:30:20.000000000 +0000
@@ -9,6 +9,7 @@
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <property name="program_name">Sshsplit</property>
+    <property name="translator_credits" translatable="yes">translator-credits</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff -Nru sshsplit-0.3/data/ui/PreferencesSshsplitDialog.ui sshsplit-0.4/data/ui/PreferencesSshsplitDialog.ui
--- sshsplit-0.3/data/ui/PreferencesSshsplitDialog.ui	2010-03-01 13:49:22.000000000 +0000
+++ sshsplit-0.4/data/ui/PreferencesSshsplitDialog.ui	2010-03-25 17:30:20.000000000 +0000
@@ -22,7 +22,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,7 +37,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff -Nru sshsplit-0.3/debian/changelog sshsplit-0.4/debian/changelog
--- sshsplit-0.3/debian/changelog	2010-03-01 15:49:58.000000000 +0000
+++ sshsplit-0.4/debian/changelog	2010-03-25 19:13:10.000000000 +0000
@@ -1,3 +1,9 @@
+sshsplit (0.4) karmic; urgency=low
+
+  * Release to fix integer conversion errors and 100% CPU bug
+
+ -- Martin Eve (www.martineve.com) <martin@martineve.com>  Thu, 25 Mar 2010 17:27:45 +0000
+
 sshsplit (0.3) karmic; urgency=low
 
   * New release.
diff -Nru sshsplit-0.3/setup.py sshsplit-0.4/setup.py
--- sshsplit-0.3/setup.py	2010-03-01 15:49:43.000000000 +0000
+++ sshsplit-0.4/setup.py	2010-03-25 19:13:33.000000000 +0000
@@ -93,7 +93,7 @@
 
 DistUtilsExtra.auto.setup(
     name='sshsplit',
-    version='0.3',
+    version='0.4',
     license='GPL-3',
     author='Martin Eve',
     author_email='martin@martineve.com',
diff -Nru sshsplit-0.3/sshsplit/AboutSshsplitDialog.py sshsplit-0.4/sshsplit/AboutSshsplitDialog.py
--- sshsplit-0.3/sshsplit/AboutSshsplitDialog.py	2010-03-01 15:49:43.000000000 +0000
+++ sshsplit-0.4/sshsplit/AboutSshsplitDialog.py	2010-03-25 19:13:27.000000000 +0000
@@ -60,6 +60,7 @@
         ui_filename = None
 
     builder = gtk.Builder()
+    builder.set_translation_domain('sshsplit')
     builder.add_from_file(ui_filename)    
     dialog = builder.get_object("about_sshsplit_dialog")
     dialog.finish_initializing(builder)
diff -Nru sshsplit-0.3/sshsplit/PreferencesSshsplitDialog.py sshsplit-0.4/sshsplit/PreferencesSshsplitDialog.py
--- sshsplit-0.3/sshsplit/PreferencesSshsplitDialog.py	2010-03-01 15:49:43.000000000 +0000
+++ sshsplit-0.4/sshsplit/PreferencesSshsplitDialog.py	2010-03-25 19:13:27.000000000 +0000
@@ -118,6 +118,7 @@
         ui_filename = None
 
     builder = gtk.Builder()
+    builder.set_translation_domain('sshsplit')
     builder.add_from_file(ui_filename)
     dialog = builder.get_object("preferences_sshsplit_dialog")
     dialog.finish_initializing(builder)
diff -Nru sshsplit-0.3/sshsplit.desktop.in sshsplit-0.4/sshsplit.desktop.in
--- sshsplit-0.3/sshsplit.desktop.in	2010-03-01 13:55:55.000000000 +0000
+++ sshsplit-0.4/sshsplit.desktop.in	2010-03-25 17:30:20.000000000 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Sshsplit
-Comment=Sshsplit application
+_Name=Sshsplit
+_Comment=Sshsplit application
 Categories=GNOME;Utility;
 Exec=sshsplit
 Icon=/usr/share/sshsplit/media/icon.png