Merged with trunk

doc/terminator_config.5

@@ -427,7 +427,6 @@ Default value: \fBUTF-8\fR
 .B copy_on_selection \fR(boolean)
 If set to True, text selections will be automatically copied to the clipboard, in addition to being made the Primary selection.
 Default value: \fBFalse\fR
-.TP
 
 .SH layouts
 

po/ru_RU.po

@@ -1,419 +0,0 @@
-# Russian (Russian Federation) translation for terminator
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the terminator package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: terminator\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-15 10:30+0000\n"
-"PO-Revision-Date: 2010-03-18 09:54+0000\n"
-"Last-Translator: Alex Goretoy <Unknown>\n"
-"Language-Team: Russian (Russian Federation) <ru_RU@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-04-07 20:40+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: ../data/terminator.desktop.in.h:1
-msgid "Multiple terminals in one window"
-msgstr ""
-
-#: ../data/terminator.desktop.in.h:2
-msgid "Terminator"
-msgstr "Терминатор"
-
-#: ../terminatorlib/notebook.py:225
-msgid "tab"
-msgstr "таб"
-
-#: ../terminatorlib/notebook.py:368
-msgid "Close Tab"
-msgstr "Закрыть вкладку"
-
-#: ../terminatorlib/encoding.py:35
-msgid "Current Locale"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:36 ../terminatorlib/encoding.py:49
-#: ../terminatorlib/encoding.py:68 ../terminatorlib/encoding.py:91
-#: ../terminatorlib/encoding.py:102
-msgid "Western"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:37 ../terminatorlib/encoding.py:69
-#: ../terminatorlib/encoding.py:81 ../terminatorlib/encoding.py:100
-msgid "Central European"
-msgstr "Центрально-европейская"
-
-#: ../terminatorlib/encoding.py:38
-msgid "South European"
-msgstr "Южно-европейская"
-
-#: ../terminatorlib/encoding.py:39 ../terminatorlib/encoding.py:47
-#: ../terminatorlib/encoding.py:107
-msgid "Baltic"
-msgstr "Прибалтика"
-
-#. [False, "JOHAB", _("Korean") ],
-#: ../terminatorlib/encoding.py:40 ../terminatorlib/encoding.py:70
-#: ../terminatorlib/encoding.py:76 ../terminatorlib/encoding.py:78
-#: ../terminatorlib/encoding.py:83 ../terminatorlib/encoding.py:101
-msgid "Cyrillic"
-msgstr "Кириллическая"
-
-#: ../terminatorlib/encoding.py:41 ../terminatorlib/encoding.py:73
-#: ../terminatorlib/encoding.py:80 ../terminatorlib/encoding.py:106
-msgid "Arabic"
-msgstr "Арабский"
-
-#: ../terminatorlib/encoding.py:42 ../terminatorlib/encoding.py:86
-#: ../terminatorlib/encoding.py:103
-msgid "Greek"
-msgstr "Греческая"
-
-#: ../terminatorlib/encoding.py:43
-msgid "Hebrew Visual"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:44 ../terminatorlib/encoding.py:72
-#: ../terminatorlib/encoding.py:89 ../terminatorlib/encoding.py:105
-msgid "Hebrew"
-msgstr "Иврит"
-
-#: ../terminatorlib/encoding.py:45 ../terminatorlib/encoding.py:71
-#: ../terminatorlib/encoding.py:93 ../terminatorlib/encoding.py:104
-msgid "Turkish"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:46
-msgid "Nordic"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:48
-msgid "Celtic"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:50 ../terminatorlib/encoding.py:92
-msgid "Romanian"
-msgstr ""
-
-#. [False, "UTF-7", _("Unicode") ],
-#: ../terminatorlib/encoding.py:52
-msgid "Unicode"
-msgstr ""
-
-#. [False, "UTF-16", _("Unicode") ],
-#. [False, "UCS-2", _("Unicode") ],
-#. [False, "UCS-4", _("Unicode") ],
-#: ../terminatorlib/encoding.py:56
-msgid "Armenian"
-msgstr "Армянская"
-
-#: ../terminatorlib/encoding.py:57 ../terminatorlib/encoding.py:58
-#: ../terminatorlib/encoding.py:62
-msgid "Chinese Traditional"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:59
-msgid "Cyrillic/Russian"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:60 ../terminatorlib/encoding.py:74
-#: ../terminatorlib/encoding.py:95
-msgid "Japanese"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:61 ../terminatorlib/encoding.py:75
-#: ../terminatorlib/encoding.py:98
-msgid "Korean"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:63 ../terminatorlib/encoding.py:64
-#: ../terminatorlib/encoding.py:65 ../terminatorlib/encoding.py:67
-msgid "Chinese Simplified"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:66
-msgid "Georgian"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:79 ../terminatorlib/encoding.py:94
-msgid "Cyrillic/Ukrainian"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:82
-msgid "Croatian"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:84
-msgid "Hindi"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:85
-msgid "Persian"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:87
-msgid "Gujarati"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:88
-msgid "Gurmukhi"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:90
-msgid "Icelandic"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:96 ../terminatorlib/encoding.py:99
-#: ../terminatorlib/encoding.py:108
-msgid "Vietnamese"
-msgstr ""
-
-#: ../terminatorlib/encoding.py:97
-msgid "Thai"
-msgstr ""
-
-#: ../terminatorlib/prefseditor.py:686 ../terminatorlib/prefseditor.py:691
-msgid "New Profile"
-msgstr ""
-
-#: ../terminatorlib/prefseditor.py:731 ../terminatorlib/prefseditor.py:736
-msgid "New Layout"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:50
-msgid "Custom Commands"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:106
-msgid "Custom Commands Configuration"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:238
-msgid "New Command"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:248
-msgid "Enabled:"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:254
-msgid "Name:"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:260
-msgid "Command:"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:296
-#: ../terminatorlib/plugins/custom_commands.py:406
-msgid "You need to define a name and command"
-msgstr ""
-
-#: ../terminatorlib/plugins/custom_commands.py:313
-#: ../terminatorlib/plugins/custom_commands.py:425
-#, python-format
-msgid "Name *%s* already exist"
-msgstr ""
-
-#: ../terminatorlib/container.py:139
-msgid "Close?"
-msgstr ""
-
-#: ../terminatorlib/container.py:146
-msgid "Close _Terminals"
-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."
-msgstr ""
-
-#. Label
-#: ../terminatorlib/searchbar.py:48
-msgid "Search:"
-msgstr ""
-
-#: ../terminatorlib/searchbar.py:64
-msgid "Close Search bar"
-msgstr ""
-
-#. Next Button
-#: ../terminatorlib/searchbar.py:69
-msgid "Next"
-msgstr ""
-
-#. Previous Button
-#: ../terminatorlib/searchbar.py:75
-msgid "Prev"
-msgstr ""
-
-#: ../terminatorlib/searchbar.py:121
-msgid "Searching scrollback"
-msgstr ""
-
-#: ../terminatorlib/searchbar.py:132 ../terminatorlib/searchbar.py:153
-msgid "No more results"
-msgstr ""
-
-#: ../terminatorlib/searchbar.py:168
-msgid "Found at row"
-msgstr ""
-
-#: ../terminatorlib/window.py:176
-msgid "window"
-msgstr ""
-
-#. FIXME: Why isn't this being done by Terminator() ?
-#: ../terminatorlib/window.py:459
-msgid "All"
-msgstr ""
-
-#: ../terminatorlib/window.py:480
-#, python-format
-msgid "Tab %d"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:347
-msgid "New group..."
-msgstr ""
-
-#: ../terminatorlib/terminal.py:352
-msgid "None"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:368
-#, python-format
-msgid "Remove group %s"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:373
-msgid "G_roup all in tab"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:378
-msgid "Ungr_oup all in tab"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:383
-msgid "Remove all groups"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:390
-#, python-format
-msgid "Close group %s"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:399
-msgid "Broadcast all"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:400
-msgid "Broadcast group"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:401
-msgid "Broadcast off"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:414
-msgid "Split to this group"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:419
-msgid "Autoclean groups"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:426
-msgid "Insert terminal number"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:430
-msgid "Insert padded terminal number"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:1088
-msgid "Unable to find a shell"
-msgstr ""
-
-#: ../terminatorlib/terminal.py:1105
-msgid "Unable to start shell:"
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:47
-msgid "_Send email to..."
-msgstr ""
-
-#: ../terminatorlib/terminal_popup_menu.py:48
-msgid "_Copy email address"
-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"
-msgstr ""

terminatorlib/notebook.py

@@ -87,6 +87,10 @@ class Notebook(Container, gtk.Notebook):
         num = 0
         for child_key in keys:
             page = self.get_nth_page(num)
+            if not page:
+                # This page does not yet exist, so make it
+                self.newtab(children[child_key])
+                page = self.get_nth_page(num)
             page.create_layout(children[child_key])
             num = num + 1
 

terminatorlib/preferences.glade

@@ -763,7 +763,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Foreground</property>
+                                    <property name="label" translatable="yes">Font colour</property>
                                   </object>
                                   <packing>
                                     <property name="top_attach">1</property>

terminatorlib/prefseditor.py

@@ -147,7 +147,6 @@ class PrefsEditor:
             self.set_values()
         except Exception, e:
             err('Unable to set values: %s' % e)
-        finally:
         self.config.uninhibit_save()
 
     def on_closebutton_clicked(self, _button):