diff --git a/po/fr.po b/po/fr.po
index 4b2329d2..dfb4e607 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: terminator\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-15 12:44+0100\n"
-"PO-Revision-Date: 2010-11-30 20:08+0000\n"
-"Last-Translator: Y.Bélaïd <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 18:55+0000\n"
+"Last-Translator: Devil505 <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-06 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../data/terminator.desktop.in.h:1
@@ -43,6 +43,8 @@ msgid ""
 "This %s has several terminals open. Closing the %s will also close all "
 "terminals within it."
 msgstr ""
+"Ce %s a plusieurs terminaux ouverts. Fermer le %s fermera tout les terminaux "
+"qui en dépend."
 
 #: ../terminatorlib/encoding.py:35
 msgid "Current Locale"
diff --git a/po/sk.po b/po/sk.po
index dbb098a4..21ceae58 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: terminator\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 22:04+0100\n"
-"PO-Revision-Date: 2009-06-26 13:09+0000\n"
-"Last-Translator: helix84 <Unknown>\n"
+"POT-Creation-Date: 2010-10-15 12:44+0100\n"
+"PO-Revision-Date: 2010-12-06 01:53+0000\n"
+"Last-Translator: bingo bongo <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 06:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-06 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../data/terminator.desktop.in.h:1
@@ -43,6 +43,8 @@ msgid ""
 "This %s has several terminals open. Closing the %s will also close all "
 "terminals within it."
 msgstr ""
+"Tento %s má niekoľko otvorených terminálov. Zavretím %s sa tiež zavrú všetky "
+"jeho terminály."
 
 #: ../terminatorlib/encoding.py:35
 msgid "Current Locale"
@@ -188,72 +190,148 @@ msgstr "vietnamské"
 msgid "Thai"
 msgstr "thajské"
 
-#: ../terminatorlib/notebook.py:259
+#: ../terminatorlib/notebook.py:264
 msgid "tab"
 msgstr "záložka"
 
-#: ../terminatorlib/notebook.py:408
+#: ../terminatorlib/notebook.py:425
 msgid "Close Tab"
 msgstr "Zatvoriť záložku"
 
+#: ../terminatorlib/optionparse.py:47
+msgid "Display program version"
+msgstr "Zobraziť verziu programu"
+
+#: ../terminatorlib/optionparse.py:49
+msgid "Maximise the window"
+msgstr "Maximalizovať okno"
+
+#: ../terminatorlib/optionparse.py:51
+msgid "Make the window fill the screen"
+msgstr "Vyplniť oknom obrazovku"
+
+#: ../terminatorlib/optionparse.py:53
+msgid "Disable window borders"
+msgstr "Zakázať okraje okna"
+
+#: ../terminatorlib/optionparse.py:55
+msgid "Hide the window at startup"
+msgstr "Skryť okno pri spustení"
+
+#: ../terminatorlib/optionparse.py:56
+msgid "Specify a title for the window"
+msgstr "Zadať nadpis pre okno"
+
+#: ../terminatorlib/optionparse.py:58
+msgid "Set the preferred size and position of the window (see X man page)"
+msgstr ""
+"Nastaviť uprednostnenú šírku a pozíciu okna (pozri stránku X manuálu)"
+
+#: ../terminatorlib/optionparse.py:60
+msgid "Specify a command to execute inside the terminal"
+msgstr "Zadať príkaz na vykonanie vnútri terminálu"
+
+#: ../terminatorlib/optionparse.py:63
+msgid ""
+"Use the rest of the command line as a command to execute inside the "
+"terminal, and its arguments"
+msgstr ""
+"Použiť zvyšok príkazového riadku ako príkaz na vykonanie vnútri terminálu, a "
+"jeho argumenty"
+
+#: ../terminatorlib/optionparse.py:66
+msgid "Set the working directory"
+msgstr "Nastaviť pracovný adresár"
+
+#: ../terminatorlib/optionparse.py:67
+msgid "Set a custom WM_WINDOW_ROLE property on the window"
+msgstr "Nastaviť voliteľnú vlastnosť okna WM_WINDOW_ROLE"
+
+#: ../terminatorlib/optionparse.py:69
+msgid "Select a layout"
+msgstr "Vybrať rozmiestnenie"
+
+#: ../terminatorlib/optionparse.py:70
+msgid "Use a different profile as the default"
+msgstr "Použiť iný profil ako predvolený"
+
+#: ../terminatorlib/optionparse.py:73
+msgid "Disable DBus"
+msgstr "Zakázať DBus"
+
+#: ../terminatorlib/optionparse.py:75
+msgid "Enable debugging information (twice for debug server)"
+msgstr ""
+"Zobraziť informáciu odchrobáčkovača (dvojmo pre odchrobáčkovací server)"
+
+#: ../terminatorlib/optionparse.py:77
+msgid "Comma separated list of classes to limit debugging to"
+msgstr "Zoznam tried oddelených čiarkami pre obmedzenie odchrobáčkovania na"
+
+#: ../terminatorlib/optionparse.py:79
+msgid "Comma separated list of methods to limit debugging to"
+msgstr "Zoznam metód oddelených čiarkami pre obmedzenie odchrobáčkovania na"
+
 #: ../terminatorlib/plugins/activitywatch.py:21
 msgid "ActivityWatch plugin unavailable: please install python-notify"
 msgstr ""
+"Nedostupný plugin sledovania aktivít ActivityWatch: prosím nainštaluj python-"
+"notify"
 
 #: ../terminatorlib/plugins/activitywatch.py:41
 msgid "Watch for activity"
-msgstr ""
+msgstr "Sledovať aktivity"
 
 #: ../terminatorlib/plugins/activitywatch.py:44
 msgid "Stop watching for activity"
-msgstr ""
+msgstr "Zastaviť sledovanie aktivity"
 
 #: ../terminatorlib/plugins/custom_commands.py:50
 msgid "Custom Commands"
-msgstr ""
+msgstr "Voliteľné príkazy"
 
 #: ../terminatorlib/plugins/custom_commands.py:106
 msgid "Custom Commands Configuration"
-msgstr ""
+msgstr "Konfigurácia voliteľných príkazov"
 
 #: ../terminatorlib/plugins/custom_commands.py:238
 msgid "New Command"
-msgstr ""
+msgstr "Nový príkaz"
 
 #: ../terminatorlib/plugins/custom_commands.py:248
 msgid "Enabled:"
-msgstr ""
+msgstr "Povolené:"
 
 #: ../terminatorlib/plugins/custom_commands.py:254
 msgid "Name:"
-msgstr ""
+msgstr "Názov:"
 
 #: ../terminatorlib/plugins/custom_commands.py:260
 msgid "Command:"
-msgstr ""
+msgstr "Príkaz:"
 
 #: ../terminatorlib/plugins/custom_commands.py:296
 #: ../terminatorlib/plugins/custom_commands.py:406
 msgid "You need to define a name and command"
-msgstr ""
+msgstr "Musíš zadať nejaké meno a príkaz"
 
 #: ../terminatorlib/plugins/custom_commands.py:313
 #: ../terminatorlib/plugins/custom_commands.py:425
 #, python-format
 msgid "Name *%s* already exist"
-msgstr ""
+msgstr "Meno *%s* už existuje"
 
 #: ../terminatorlib/plugins/terminalshot.py:28
 msgid "Terminal screenshot"
-msgstr ""
+msgstr "Snímka terminálu"
 
-#: ../terminatorlib/prefseditor.py:886 ../terminatorlib/prefseditor.py:891
+#: ../terminatorlib/prefseditor.py:902 ../terminatorlib/prefseditor.py:907
 msgid "New Profile"
-msgstr ""
+msgstr "Nový profil"
 
-#: ../terminatorlib/prefseditor.py:931 ../terminatorlib/prefseditor.py:936
+#: ../terminatorlib/prefseditor.py:947 ../terminatorlib/prefseditor.py:952
 msgid "New Layout"
-msgstr ""
+msgstr "Nový rozmiestnenie"
 
 #. Label
 #: ../terminatorlib/searchbar.py:48
@@ -262,7 +340,7 @@ msgstr "Hľadať:"
 
 #: ../terminatorlib/searchbar.py:64
 msgid "Close Search bar"
-msgstr ""
+msgstr "Zavrieť vyhľadávací panel"
 
 #. Next Button
 #: ../terminatorlib/searchbar.py:69
@@ -272,43 +350,43 @@ msgstr "Ďalej"
 #. Previous Button
 #: ../terminatorlib/searchbar.py:75
 msgid "Prev"
-msgstr ""
+msgstr "Predošlé"
 
 #: ../terminatorlib/searchbar.py:121
 msgid "Searching scrollback"
-msgstr ""
+msgstr "Prehľadáva sa naspäť"
 
 #: ../terminatorlib/searchbar.py:132 ../terminatorlib/searchbar.py:153
 msgid "No more results"
-msgstr ""
+msgstr "Žiadne ďalšie výsledky"
 
 #: ../terminatorlib/searchbar.py:168
 msgid "Found at row"
-msgstr ""
+msgstr "Nájdené v riadku"
 
 #: ../terminatorlib/terminal_popup_menu.py:51
 msgid "_Send email to..."
-msgstr ""
+msgstr "Po_slať email pre..."
 
 #: ../terminatorlib/terminal_popup_menu.py:52
 msgid "_Copy email address"
-msgstr ""
+msgstr "Kopírovať emailovú adresu"
 
 #: ../terminatorlib/terminal_popup_menu.py:54
 msgid "Ca_ll VoIP address"
-msgstr ""
+msgstr "Zavo_lať na VoIP adresu"
 
 #: ../terminatorlib/terminal_popup_menu.py:55
 msgid "_Copy VoIP address"
-msgstr ""
+msgstr "Kopírovať VoIP adresu"
 
 #: ../terminatorlib/terminal_popup_menu.py:57
 msgid "_Open link"
-msgstr ""
+msgstr "_Otvoriť linku"
 
 #: ../terminatorlib/terminal_popup_menu.py:58
 msgid "_Copy address"
-msgstr ""
+msgstr "Kopírovať adresu"
 
 #: ../terminatorlib/terminal_popup_menu.py:86
 msgid "Split H_orizontally"
@@ -336,11 +414,11 @@ msgstr "Ma_ximalizovať terminál"
 
 #: ../terminatorlib/terminal_popup_menu.py:136
 msgid "_Restore all terminals"
-msgstr ""
+msgstr "Obnoviť všetky terminály"
 
 #: ../terminatorlib/terminal_popup_menu.py:143
 msgid "Grouping"
-msgstr ""
+msgstr "Zoskupovanie"
 
 #: ../terminatorlib/terminal_popup_menu.py:150
 msgid "Show _scrollbar"
@@ -348,11 +426,11 @@ msgstr "Zobraziť po_suvník"
 
 #: ../terminatorlib/terminal_popup_menu.py:156
 msgid "_Preferences"
-msgstr ""
+msgstr "_Nastavenia"
 
 #: ../terminatorlib/terminal_popup_menu.py:163
 msgid "Profiles"
-msgstr ""
+msgstr "Profily"
 
 #: ../terminatorlib/terminal_popup_menu.py:207
 msgid "Encodings"
@@ -360,81 +438,81 @@ msgstr "Kódovania"
 
 #: ../terminatorlib/terminal_popup_menu.py:222
 msgid "Default"
-msgstr ""
+msgstr "Predvolené"
 
 #: ../terminatorlib/terminal_popup_menu.py:225
 msgid "User defined"
-msgstr ""
+msgstr "Definované užívateľom"
 
 #: ../terminatorlib/terminal_popup_menu.py:241
 msgid "Other Encodings"
 msgstr "Iné kódovania"
 
-#: ../terminatorlib/terminal.py:365
+#: ../terminatorlib/terminal.py:366
 msgid "New group..."
-msgstr ""
+msgstr "Nová skupina..."
 
-#: ../terminatorlib/terminal.py:370
+#: ../terminatorlib/terminal.py:371
 msgid "None"
 msgstr "Žiadna"
 
-#: ../terminatorlib/terminal.py:386
+#: ../terminatorlib/terminal.py:387
 #, python-format
 msgid "Remove group %s"
-msgstr ""
+msgstr "Odobrať skupinu %s"
 
-#: ../terminatorlib/terminal.py:391
+#: ../terminatorlib/terminal.py:392
 msgid "G_roup all in tab"
-msgstr ""
+msgstr "Zoskupiť všetko na karte"
 
-#: ../terminatorlib/terminal.py:396
+#: ../terminatorlib/terminal.py:397
 msgid "Ungr_oup all in tab"
-msgstr ""
+msgstr "Rozskupiť všetko na karte"
 
-#: ../terminatorlib/terminal.py:401
+#: ../terminatorlib/terminal.py:402
 msgid "Remove all groups"
-msgstr ""
+msgstr "Odobrať všetky skupiny"
 
-#: ../terminatorlib/terminal.py:408
+#: ../terminatorlib/terminal.py:409
 #, python-format
 msgid "Close group %s"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:417
-msgid "Broadcast all"
-msgstr ""
+msgstr "Zatvoriť skupinu %s"
 
 #: ../terminatorlib/terminal.py:418
-msgid "Broadcast group"
-msgstr ""
+msgid "Broadcast all"
+msgstr "Vysielať všetko"
 
 #: ../terminatorlib/terminal.py:419
+msgid "Broadcast group"
+msgstr "Vysielacia skupina"
+
+#: ../terminatorlib/terminal.py:420
 msgid "Broadcast off"
-msgstr ""
+msgstr "Vysielanie vypnuté"
 
-#: ../terminatorlib/terminal.py:432
+#: ../terminatorlib/terminal.py:433
 msgid "Split to this group"
-msgstr ""
+msgstr "Rozdeliť po túto skupinu"
 
-#: ../terminatorlib/terminal.py:437
+#: ../terminatorlib/terminal.py:438
 msgid "Autoclean groups"
-msgstr ""
+msgstr "Automatické čistenie skupín"
 
-#: ../terminatorlib/terminal.py:444
+#: ../terminatorlib/terminal.py:445
 msgid "Insert terminal number"
-msgstr ""
+msgstr "Zadať číslo terminálu"
 
-#: ../terminatorlib/terminal.py:448
+#: ../terminatorlib/terminal.py:449
 msgid "Insert padded terminal number"
-msgstr ""
+msgstr "Vložiť vypchané číslo terminála"
 
-#: ../terminatorlib/terminal.py:1157
+#: ../terminatorlib/terminal.py:1158
 msgid "Unable to find a shell"
 msgstr "Nepodarilo sa nájsť shell"
 
-#: ../terminatorlib/terminal.py:1174
+#: ../terminatorlib/terminal.py:1175
 msgid "Unable to start shell:"
-msgstr ""
+msgstr "Nepodarilo sa spustiť shell:"
 
 #: ../terminatorlib/window.py:224
 msgid "window"
@@ -448,4 +526,4 @@ msgstr "Všetky"
 #: ../terminatorlib/window.py:566
 #, python-format
 msgid "Tab %d"
-msgstr ""
+msgstr "Karta %d"