diff --git a/po/terminator.pot b/po/terminator.pot
index 9b0b3907..21f5844c 100644
--- a/po/terminator.pot
+++ b/po/terminator.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 22:04+0100\n"
+"POT-Creation-Date: 2010-10-15 12:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -187,14 +188,84 @@ msgstr ""
 msgid "Thai"
 msgstr ""
 
-#: ../terminatorlib/notebook.py:259
+#: ../terminatorlib/notebook.py:264
 msgid "tab"
 msgstr ""
 
-#: ../terminatorlib/notebook.py:408
+#: ../terminatorlib/notebook.py:425
 msgid "Close Tab"
 msgstr ""
 
+#: ../terminatorlib/optionparse.py:47
+msgid "Display program version"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:49
+msgid "Maximise the window"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:51
+msgid "Make the window fill the screen"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:53
+msgid "Disable window borders"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:55
+msgid "Hide the window at startup"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:56
+msgid "Specify a title for the window"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:58
+msgid "Set the preferred size and position of the window (see X man page)"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:60
+msgid "Specify a command to execute inside the terminal"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:63
+msgid ""
+"Use the rest of the command line as a command to execute inside the "
+"terminal, and its arguments"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:66
+msgid "Set the working directory"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:67
+msgid "Set a custom WM_WINDOW_ROLE property on the window"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:69
+msgid "Select a layout"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:70
+msgid "Use a different profile as the default"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:73
+msgid "Disable DBus"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:75
+msgid "Enable debugging information (twice for debug server)"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:77
+msgid "Comma separated list of classes to limit debugging to"
+msgstr ""
+
+#: ../terminatorlib/optionparse.py:79
+msgid "Comma separated list of methods to limit debugging to"
+msgstr ""
+
 #: ../terminatorlib/plugins/activitywatch.py:21
 msgid "ActivityWatch plugin unavailable: please install python-notify"
 msgstr ""
@@ -246,11 +317,11 @@ msgstr ""
 msgid "Terminal screenshot"
 msgstr ""
 
-#: ../terminatorlib/prefseditor.py:886 ../terminatorlib/prefseditor.py:891
+#: ../terminatorlib/prefseditor.py:902 ../terminatorlib/prefseditor.py:907
 msgid "New Profile"
 msgstr ""
 
-#: ../terminatorlib/prefseditor.py:931 ../terminatorlib/prefseditor.py:936
+#: ../terminatorlib/prefseditor.py:947 ../terminatorlib/prefseditor.py:952
 msgid "New Layout"
 msgstr ""
 
@@ -369,69 +440,69 @@ msgstr ""
 msgid "Other Encodings"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:365
+#: ../terminatorlib/terminal.py:366
 msgid "New group..."
 msgstr ""
 
-#: ../terminatorlib/terminal.py:370
+#: ../terminatorlib/terminal.py:371
 msgid "None"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:386
+#: ../terminatorlib/terminal.py:387
 #, python-format
 msgid "Remove group %s"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:391
+#: ../terminatorlib/terminal.py:392
 msgid "G_roup all in tab"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:396
+#: ../terminatorlib/terminal.py:397
 msgid "Ungr_oup all in tab"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:401
+#: ../terminatorlib/terminal.py:402
 msgid "Remove all groups"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:408
+#: ../terminatorlib/terminal.py:409
 #, python-format
 msgid "Close group %s"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:417
+#: ../terminatorlib/terminal.py:418
 msgid "Broadcast all"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:418
+#: ../terminatorlib/terminal.py:419
 msgid "Broadcast group"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:419
+#: ../terminatorlib/terminal.py:420
 msgid "Broadcast off"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:432
+#: ../terminatorlib/terminal.py:433
 msgid "Split to this group"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:437
+#: ../terminatorlib/terminal.py:438
 msgid "Autoclean groups"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:444
+#: ../terminatorlib/terminal.py:445
 msgid "Insert terminal number"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:448
+#: ../terminatorlib/terminal.py:449
 msgid "Insert padded terminal number"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:1157
+#: ../terminatorlib/terminal.py:1158
 msgid "Unable to find a shell"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:1174
+#: ../terminatorlib/terminal.py:1175
 msgid "Unable to start shell:"
 msgstr ""
 
diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py
index 55cda32b..13a2a09d 100755
--- a/terminatorlib/optionparse.py
+++ b/terminatorlib/optionparse.py
@@ -24,6 +24,7 @@ from util import dbg, err
 import util
 import config
 import version
+from translation import _
 
 def execute_cb(option, opt, value, lparser):
     """Callback for use in parsing execute options"""
@@ -43,39 +44,39 @@ def parse_options():
     parser = OptionParser(usage)
 
     parser.add_option('-v', '--version', action='store_true', dest='version',
-            help='Display program version')
+            help=_('Display program version'))
     parser.add_option('-m', '--maximise', action='store_true', dest='maximise',
-            help='Maximise the window')
+            help=_('Maximise the window'))
     parser.add_option('-f', '--fullscreen', action='store_true',
-            dest='fullscreen', help='Make the window fill the screen')
+            dest='fullscreen', help=_('Make the window fill the screen'))
     parser.add_option('-b', '--borderless', action='store_true',
-            dest='borderless', help='Disable window borders')
+            dest='borderless', help=_('Disable window borders'))
     parser.add_option('-H', '--hidden', action='store_true', dest='hidden',
-            help='Hide the window at startup')
-    parser.add_option('-T', '--title', dest='forcedtitle', help='Specify a \
-title for the window')
-    parser.add_option('--geometry', dest='geometry', type='string', help='Set \
-the preferred size and position of the window (see X man page)')
-    parser.add_option('-e', '--command', dest='command', help='Specify a \
-command to execute inside the terminal')
+            help=_('Hide the window at startup'))
+    parser.add_option('-T', '--title', dest='forcedtitle', help=_('Specify a \
+title for the window'))
+    parser.add_option('--geometry', dest='geometry', type='string', help=_('Set \
+the preferred size and position of the window (see X man page)'))
+    parser.add_option('-e', '--command', dest='command', help=_('Specify a \
+command to execute inside the terminal'))
     parser.add_option('-x', '--execute', dest='execute', action='callback',
-            callback=execute_cb, help='Use the rest of the command line as a \
-command to execute inside the terminal, and its arguments')
+            callback=execute_cb, help=_('Use the rest of the command line as a \
+command to execute inside the terminal, and its arguments'))
     parser.add_option('--working-directory', metavar='DIR',
-            dest='working_directory', help='Set the working directory')
-    parser.add_option('-r', '--role', dest='role', help='Set a custom \
-WM_WINDOW_ROLE property on the window')
-    parser.add_option('-l', '--layout', dest='layout', help='Select a layout')
-    parser.add_option('-p', '--profile', dest='profile', help='Use a \
-different profile as the default')
+            dest='working_directory', help=_('Set the working directory'))
+    parser.add_option('-r', '--role', dest='role', help=_('Set a custom \
+WM_WINDOW_ROLE property on the window'))
+    parser.add_option('-l', '--layout', dest='layout', help=_('Select a layout'))
+    parser.add_option('-p', '--profile', dest='profile', help=_('Use a \
+different profile as the default'))
     parser.add_option('-u', '--no-dbus', action='store_true', dest='nodbus', 
-            help='Disable DBus')
+            help=_('Disable DBus'))
     parser.add_option('-d', '--debug', action='count', dest='debug',
-            help='Enable debugging information (twice for debug server)')
+            help=_('Enable debugging information (twice for debug server)'))
     parser.add_option('--debug-classes', action='store', dest='debug_classes', 
-            help='Comma separated list of classes to limit debugging to')
+            help=_('Comma separated list of classes to limit debugging to'))
     parser.add_option('--debug-methods', action='store', dest='debug_methods',
-            help='Comma separated list of methods to limit debugging to')
+            help=_('Comma separated list of methods to limit debugging to'))
     for item in ['--sm-client-id', '--sm-config-prefix', '--screen', '-n',
     '--no-gconf' ]:
         parser.add_option(item, dest='dummy', action='store',