diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf553ea1..9a5d11a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,37 +4,41 @@
 [encoding: UTF-8]
 terminator
 data/terminator.desktop.in
-terminatorlib/notebook.py
-terminatorlib/encoding.py
-terminatorlib/cwd.py
-terminatorlib/keybindings.py
-terminatorlib/version.py
-terminatorlib/configobj/validate.py
+terminatorlib/borg.py
 terminatorlib/configobj/configobj.py
+terminatorlib/configobj/__init__.py
+terminatorlib/configobj/validate.py
+terminatorlib/config.py
+terminatorlib/container.py
+terminatorlib/cwd.py
 terminatorlib/debugserver.py
-terminatorlib/optionparse.py
-terminatorlib/prefseditor.py
+terminatorlib/editablelabel.py
+terminatorlib/encoding.py
+terminatorlib/factory.py
 terminatorlib/freebsd.py
+terminatorlib/__init__.py
+terminatorlib/keybindings.py
+terminatorlib/notebook.py
+terminatorlib/optionparse.py
+terminatorlib/paned.py
+terminatorlib/plugin.py
+terminatorlib/plugins/activitywatch.py
+terminatorlib/plugins/custom_commands.py
+terminatorlib/plugins/terminalshot.py
+terminatorlib/plugins/testplugin.py
+terminatorlib/plugins/url_handlers.py
+terminatorlib/prefseditor.py
+terminatorlib/searchbar.py
+terminatorlib/signalman.py
+terminatorlib/terminal_popup_menu.py
+terminatorlib/terminal.py
+terminatorlib/terminator.py
+terminatorlib/tests/__init__.py
+terminatorlib/tests/testborg.py
 terminatorlib/tests/test_doctests.py
 terminatorlib/tests/testsignalman.py
-terminatorlib/tests/testborg.py
-terminatorlib/plugins/custom_commands.py
-terminatorlib/plugins/url_handlers.py
-terminatorlib/plugins/terminal_menu.py
-terminatorlib/plugins/testplugin.py
-terminatorlib/container.py
-terminatorlib/searchbar.py
-terminatorlib/terminator.py
-terminatorlib/util.py
-terminatorlib/plugin.py
-terminatorlib/borg.py
 terminatorlib/titlebar.py
-terminatorlib/window.py
-terminatorlib/terminal.py
-terminatorlib/editablelabel.py
-terminatorlib/config.py
-terminatorlib/terminal_popup_menu.py
-terminatorlib/paned.py
-terminatorlib/factory.py
 terminatorlib/translation.py
-terminatorlib/signalman.py
+terminatorlib/util.py
+terminatorlib/version.py
+terminatorlib/window.py
diff --git a/po/terminator.pot b/po/terminator.pot
index 6644ede9..9b0b3907 100644
--- a/po/terminator.pot
+++ b/po/terminator.pot
@@ -1,17 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-15 10:30+0000\n"
+"POT-Creation-Date: 2010-07-03 22:04+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 20:40+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
 
 #: ../data/terminator.desktop.in.h:1
 msgid "Multiple terminals in one window"
@@ -21,12 +24,23 @@ msgstr ""
 msgid "Terminator"
 msgstr ""
 
-#: ../terminatorlib/notebook.py:225
-msgid "tab"
+#: ../terminatorlib/container.py:149
+msgid "Close?"
 msgstr ""
 
-#: ../terminatorlib/notebook.py:368
-msgid "Close Tab"
+#: ../terminatorlib/container.py:156
+msgid "Close _Terminals"
+msgstr ""
+
+#: ../terminatorlib/container.py:158
+msgid "<big><b>Close multiple terminals?</b></big>"
+msgstr ""
+
+#: ../terminatorlib/container.py:161
+#, python-format
+msgid ""
+"This %s has several terminals open. Closing the %s will also close all "
+"terminals within it."
 msgstr ""
 
 #: ../terminatorlib/encoding.py:35
@@ -173,12 +187,24 @@ msgstr ""
 msgid "Thai"
 msgstr ""
 
-#: ../terminatorlib/prefseditor.py:686 ../terminatorlib/prefseditor.py:691
-msgid "New Profile"
+#: ../terminatorlib/notebook.py:259
+msgid "tab"
 msgstr ""
 
-#: ../terminatorlib/prefseditor.py:731 ../terminatorlib/prefseditor.py:736
-msgid "New Layout"
+#: ../terminatorlib/notebook.py:408
+msgid "Close Tab"
+msgstr ""
+
+#: ../terminatorlib/plugins/activitywatch.py:21
+msgid "ActivityWatch plugin unavailable: please install python-notify"
+msgstr ""
+
+#: ../terminatorlib/plugins/activitywatch.py:41
+msgid "Watch for activity"
+msgstr ""
+
+#: ../terminatorlib/plugins/activitywatch.py:44
+msgid "Stop watching for activity"
 msgstr ""
 
 #: ../terminatorlib/plugins/custom_commands.py:50
@@ -216,23 +242,16 @@ msgstr ""
 msgid "Name *%s* already exist"
 msgstr ""
 
-#: ../terminatorlib/container.py:139
-msgid "Close?"
+#: ../terminatorlib/plugins/terminalshot.py:28
+msgid "Terminal screenshot"
 msgstr ""
 
-#: ../terminatorlib/container.py:146
-msgid "Close _Terminals"
+#: ../terminatorlib/prefseditor.py:886 ../terminatorlib/prefseditor.py:891
+msgid "New Profile"
 msgstr ""
 
-#: ../terminatorlib/container.py:148
-msgid "<big><b>Close multiple terminals?</b></big>"
-msgstr ""
-
-#: ../terminatorlib/container.py:151
-#, python-format
-msgid ""
-"This %s has several terminals open. Closing the %s will also close all "
-"terminals within it."
+#: ../terminatorlib/prefseditor.py:931 ../terminatorlib/prefseditor.py:936
+msgid "New Layout"
 msgstr ""
 
 #. Label
@@ -266,150 +285,166 @@ msgstr ""
 msgid "Found at row"
 msgstr ""
 
-#: ../terminatorlib/window.py:176
-msgid "window"
+#: ../terminatorlib/terminal_popup_menu.py:51
+msgid "_Send email to..."
 msgstr ""
 
-#. FIXME: Why isn't this being done by Terminator() ?
-#: ../terminatorlib/window.py:459
-msgid "All"
+#: ../terminatorlib/terminal_popup_menu.py:52
+msgid "_Copy email address"
 msgstr ""
 
-#: ../terminatorlib/window.py:480
-#, python-format
-msgid "Tab %d"
+#: ../terminatorlib/terminal_popup_menu.py:54
+msgid "Ca_ll VoIP address"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:347
+#: ../terminatorlib/terminal_popup_menu.py:55
+msgid "_Copy VoIP address"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:57
+msgid "_Open link"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:58
+msgid "_Copy address"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:86
+msgid "Split H_orizontally"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:96
+msgid "Split V_ertically"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:106
+msgid "Open _Tab"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:112
+msgid "Open _Debug Tab"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:126
+msgid "_Zoom terminal"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:130
+msgid "Ma_ximise terminal"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:136
+msgid "_Restore all terminals"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:143
+msgid "Grouping"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:150
+msgid "Show _scrollbar"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:156
+msgid "_Preferences"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:163
+msgid "Profiles"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:207
+msgid "Encodings"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:222
+msgid "Default"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:225
+msgid "User defined"
+msgstr ""
+
+#: ../terminatorlib/terminal_popup_menu.py:241
+msgid "Other Encodings"
+msgstr ""
+
+#: ../terminatorlib/terminal.py:365
 msgid "New group..."
 msgstr ""
 
-#: ../terminatorlib/terminal.py:352
+#: ../terminatorlib/terminal.py:370
 msgid "None"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:368
+#: ../terminatorlib/terminal.py:386
 #, python-format
 msgid "Remove group %s"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:373
+#: ../terminatorlib/terminal.py:391
 msgid "G_roup all in tab"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:378
+#: ../terminatorlib/terminal.py:396
 msgid "Ungr_oup all in tab"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:383
+#: ../terminatorlib/terminal.py:401
 msgid "Remove all groups"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:390
+#: ../terminatorlib/terminal.py:408
 #, python-format
 msgid "Close group %s"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:399
+#: ../terminatorlib/terminal.py:417
 msgid "Broadcast all"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:400
+#: ../terminatorlib/terminal.py:418
 msgid "Broadcast group"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:401
+#: ../terminatorlib/terminal.py:419
 msgid "Broadcast off"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:414
+#: ../terminatorlib/terminal.py:432
 msgid "Split to this group"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:419
+#: ../terminatorlib/terminal.py:437
 msgid "Autoclean groups"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:426
+#: ../terminatorlib/terminal.py:444
 msgid "Insert terminal number"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:430
+#: ../terminatorlib/terminal.py:448
 msgid "Insert padded terminal number"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:1088
+#: ../terminatorlib/terminal.py:1157
 msgid "Unable to find a shell"
 msgstr ""
 
-#: ../terminatorlib/terminal.py:1105
+#: ../terminatorlib/terminal.py:1174
 msgid "Unable to start shell:"
 msgstr ""
 
-#: ../terminatorlib/terminal_popup_menu.py:47
-msgid "_Send email to..."
+#: ../terminatorlib/window.py:224
+msgid "window"
 msgstr ""
 
-#: ../terminatorlib/terminal_popup_menu.py:48
-msgid "_Copy email address"
+#. FIXME: Why isn't this being done by Terminator() ?
+#: ../terminatorlib/window.py:545
+msgid "All"
 msgstr ""
 
-#: ../terminatorlib/terminal_popup_menu.py:50
-msgid "Ca_ll VoIP address"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:51
-msgid "_Copy VoIP address"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:53
-msgid "_Open link"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:54
-msgid "_Copy address"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:102
-msgid "Open _Tab"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:115
-msgid "_Zoom terminal"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:119
-msgid "Ma_ximise terminal"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:125
-msgid "_Restore all terminals"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:131
-msgid "Show _scrollbar"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:136
-msgid "_Preferences"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:144
-msgid "Profiles"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:188
-msgid "Encodings"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:203
-msgid "Default"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:206
-msgid "User defined"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:222
-msgid "Other Encodings"
+#: ../terminatorlib/window.py:566
+#, python-format
+msgid "Tab %d"
 msgstr ""